From ccb04c71c23401250adcf1475d08635ac6d3ddce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Tue, 14 Jun 2022 09:30:22 +0200 Subject: [PATCH 1/3] AAI-povezave responsive popravek --- frontend/simple/css/aai.css | 43 +++++++++++++------------------------ 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css index 328f3462f..64aa07ee7 100644 --- a/frontend/simple/css/aai.css +++ b/frontend/simple/css/aai.css @@ -202,7 +202,7 @@ header nav span.lang_switch img { font-size: 18px; line-height: 23px; - margin-top: 20px; + margin-top: 25px; margin-bottom: 8px; @@ -212,17 +212,12 @@ header nav span.lang_switch img { text-align: center; max-width: min(254px,25%); + + flex: 1; + margin-right: 25px; } -.povezave .col:nth-of-type(1) { - margin-right: 5px; -} -.povezave .col:nth-of-type(4) { - margin-left: 5px; -} -.povezave .col:nth-of-type(2), -.povezave .col:nth-of-type(3) { - margin-left: 5px; - margin-right: 5px; +.povezave .col:last-child{ + margin-right: 0px; } .povezave_img{ @@ -242,7 +237,7 @@ header nav span.lang_switch img { margin-top: 0px; margin-bottom: 25px; } -@media screen and (max-width: 910px) { +@media screen and (max-width: 955px) { .povezave .col p { min-height: 110px; margin-bottom: 0px; @@ -456,23 +451,15 @@ input[type=button]:hover, } .povezave .col { - margin: auto; margin-top: 50px; width: auto; - max-width: none; - + max-width: none; } - .povezave .col:nth-of-type(1), - .povezave .col:nth-of-type(3) { - margin-left: 20px; - margin-right: 30px; - } - .povezave .col:nth-of-type(2), - .povezave .col:nth-of-type(4) { - margin-right: 20px; - margin-left: 0px; + .povezave .col:last-child{ + margin-right: 25px; } + .povezave .col p { max-width: 392px; @@ -480,11 +467,11 @@ input[type=button]:hover, min-height: unset; margin-bottom: 25px; } - @media screen and (max-width: 739px) { + /* @media screen and (max-width: 739px) { .povezave .col p { min-height: 80px; } - } + } */ #povezave-btn { margin: 0px auto; @@ -505,7 +492,7 @@ input[type=button]:hover, /* border: 1px solid red; */ max-width: 100%; width: auto; - + } footer .footer_content .col .logo_holder{ @@ -766,7 +753,7 @@ input[type=button]:hover, max-height: 180px; text-align: left; - + } footer .footer_content .col span { From def4edef0a685684e9e69dc023bd01ce432bf6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Tue, 14 Jun 2022 09:53:56 +0200 Subject: [PATCH 2/3] AAI pomembne povezave-btn barva / ikona --- frontend/simple/classes/DisplayController.php | 8 ++++---- frontend/simple/css/aai.css | 13 +++++++------ public/img/icons/chevron_orange.svg | 3 +++ 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 public/img/icons/chevron_orange.svg diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php index ff56dc084..40b871c73 100644 --- a/frontend/simple/classes/DisplayController.php +++ b/frontend/simple/classes/DisplayController.php @@ -462,28 +462,28 @@ class DisplayController{ echo 'kako deluje'; echo '

'.$lang["povezave__kako_deluje_h2"].'

'; echo '

'.$lang["povezave__kako_deluje_text"].'

'; - echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; echo ''; echo '
'; echo 'o 1ka'; echo '

'.$lang["povezave_o_1ka_h2"].'

'; echo '

'.$lang["povezave_o_1ka_text"].'

'; - echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; echo '
'; echo '
'; echo '1ka podpora'; echo '

'.$lang["povezave_1ka_podpora_h2"].'

'; echo '

'.$lang["povezave_1ka_podpora_text"].'

'; - echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; echo '
'; echo '
'; echo 'arnes podpora'; echo '

'.$lang["povezave_arnes_podpora_h2"].'

'; echo '

'.$lang["povezave_arnes_podpora_text"].'

'; - echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; echo '
'; echo ''; diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css index 64aa07ee7..3a62e4021 100644 --- a/frontend/simple/css/aai.css +++ b/frontend/simple/css/aai.css @@ -249,32 +249,33 @@ header nav span.lang_switch img { justify-content: space-between; align-items: center; - background-color: #F07D3E; + background-color: white; border: 1px solid #F07D3E; - color: white; + color: #F07D3E; font-size: 16px; font-weight: 600; line-height: 26px; padding: 11px 16px; - margin: 0px 20px; + margin: 0px auto; max-width: 165px; - background: linear-gradient(to left, #F07D3E 50%, white 50%) right; + background: linear-gradient(to left, white 50%, #F07D3E 50%) right; background-size: 200%; transition: .3s ease-out; } #povezave-btn:hover { - color: #F07D3E; - background-color: white; + color: white; + background-color: #F07D3E; border: 1px solid #F07D3E; background-position: left; } + footer { width: 100%; } diff --git a/public/img/icons/chevron_orange.svg b/public/img/icons/chevron_orange.svg new file mode 100644 index 000000000..66c14fbd0 --- /dev/null +++ b/public/img/icons/chevron_orange.svg @@ -0,0 +1,3 @@ + + + From f189ffd6b7afd0a617a93177fd5c7df354bf2832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Tue, 14 Jun 2022 10:00:25 +0200 Subject: [PATCH 3/3] =?UTF-8?q?AAI=20-=20popravljena=20=C5=A1irina=20za=20?= =?UTF-8?q?cookije?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/simple/css/aai.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css index 3a62e4021..4bdce66e5 100644 --- a/frontend/simple/css/aai.css +++ b/frontend/simple/css/aai.css @@ -4,6 +4,10 @@ font-family: "Source Sans Pro","sans-serif"; } +.cookie_notice { + max-width: 1160px; +} + body { max-width: 1160px; margin: auto;