aslan
/
applicant-site
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'cross-browser code added' (#24) from RomanGolienko/Roman_applicant-site:new-design into main
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (push) Failing after 1m31s Details
Tests & Lint & Deploy to Railway / deploy (push) Has been skipped Details 

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/24
This commit is contained in:
aslan 2024-03-13 10:43:10 +03:00
parent 4e2d8bec4b 4af0da1984
commit 6230a15d17
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/img/logo/favicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
public/img/logo/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
public/img/logo/logo_1-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

BIN
public/img/logo/white-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

2
resources/views/layouts/new-design-layout.blade.php
View File

@ -9,7 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Place favicon.ico in the root directory --> <!-- Place favicon.ico in the root directory -->
<link rel="shortcut icon" type="image/x-icon" href="{{ URL::to('img/logo/favicon.png') }}"> <link rel="shortcut icon" type="image/x-icon" href="{{ URL::to('img/logo/logo_1-2.png') }}">
<!-- CSS here --> <!-- CSS here -->

14
resources/views/new-design/bakalavr-special.blade.php
View File

@ -213,15 +213,25 @@
<body> <body>
<!--YaBrowser-->
<header> <header>
<div class="container-fluid " style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;"> <div class="container-fluid " style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
<?php $browser = $_SERVER['HTTP_USER_AGENT']; ?>
<?php if (strstr($browser, "YaBrowser")) { ?>
<div class=" d-none d-xl-flex justify-content-end align-items-end position-absolute float-end z-1 " style="height: 100%; bottom: 35px;" >
<div style="width: 60%">
<img class="img-fluid float-end " src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt="">
</div>
</div>
<?php }else{ ?>
<div class=" d-none d-xl-flex justify-content-end align-items-end position-absolute float-end z-1 " style="height: 100%; bottom: -10px;" > <div class=" d-none d-xl-flex justify-content-end align-items-end position-absolute float-end z-1 " style="height: 100%; bottom: -10px;" >
<div style="width: 60%"> <div style="width: 60%">
<img class="img-fluid float-end " src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt=""> <img class="img-fluid float-end " src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt="">
</div> </div>
</div> </div>
<?php } ?>
<div class="ms-0 ms-md-5 "> <div class="ms-0 ms-md-5 ">
<div class="row"> <div class="row">
<div class="col-lg-3 col-12 d-none d-xl-flex justify-content-start align-items-center"> <div class="col-lg-3 col-12 d-none d-xl-flex justify-content-start align-items-center">