diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css index 0f69f8fc6..2d5dd7061 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css +++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css @@ -1448,6 +1448,10 @@ input.error-field { @-webkit-keyframes ellipsis { to { width: 20px; } } +#nakupovanje-1ka { + width: 1000px; + margin: 0 auto; } + .accordion-toggle { max-height: 0; transition: max-height 0.3s ease-out; @@ -1520,17 +1524,23 @@ input.error-field { padding-right: 40px; } .nakup-1ka .leva .month-pick { width: 100%; } + .nakup-1ka .leva .sklop .checkbox-field { + padding: 0; } .nakup-1ka .desna { width: 50%; padding-left: 40px; display: flex; flex-direction: row; } .nakup-1ka .desna .ddesna { - width: 50%; padding-top: 50px; - padding-left: 50px; } + margin-left: auto; + padding-top: 104px; } + .nakup-1ka .desna .ddesna .cena-z-ddv-text { + font-size: 18px; } .nakup-1ka .desna .dleva { - width: 50%; } + width: 54%; } + .nakup-1ka .desna .dleva h4 { + font-size: 16px; } .nakup-1ka .section-main { display: -webkit-box; display: -webkit-flex; @@ -1543,6 +1553,10 @@ input.error-field { -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; } + .nakup-1ka .section-main .col.packet { + padding: 0; } + .nakup-1ka .section-main .col.packet h3 { + margin: 0 !important; } .nakup-1ka .section-main.column { flex-direction: column; } .nakup-1ka .section-main .col { @@ -1594,6 +1608,8 @@ input.error-field { margin-top: 40px; display: flex; justify-content: space-between; } + .nakup-1ka .gumbi .submit-btn { + text-transform: uppercase; } .nakup-1ka .gumbi .nazaj { margin-left: 25px; margin-right: 15px; @@ -1657,7 +1673,7 @@ input.error-field { border-color: #d1d1d1; } .nakup-1ka .izbira input[type=radio]:checked + .mesec { background: #f1f1f1; - color: #1e88e5; + color: #0040A9; border-color: #d1d1d1; } .nakup-1ka .izbira .paket.vrsta-placila { width: 31%; } @@ -1673,8 +1689,8 @@ input.error-field { font-weight: 600; margin-bottom: 0; } .nakup-1ka #skupaj-placilo .text-small { - font-style: italic; - font-size: 14px; } + font-size: 14px; + color: #1e88e5; } .nakup-1ka .col._narocilo { padding-top: 2rem; } .nakup-1ka .col._narocilo .col { @@ -1740,7 +1756,9 @@ input.error-field { .nakup-1ka .izbira .paket, .nakup-1ka .izbira .paket.vrsta-placila, .nakup-1ka .izbira .mesec { - width: 259px; } } + width: 259px; } + .nakup-1ka .izbira .paket { + display: block; } } @media (max-width: 991px) { .paketi .razpri-zapri-vse.active { display: none; } @@ -2245,6 +2263,9 @@ a { .node--view-mode-search-result h2:hover { text-decoration: underline; } +.iskanje-najdeno-st-zadetkov { + color: #D1D1D1; } + .novice-page ul { display: -webkit-box; display: -webkit-flex; @@ -2598,7 +2619,7 @@ ol { .w-list-unstyled { padding-left: 0; list-style: none; } - .w-list-unstyled .w-list-unstyled { + .w-list-unstyled .menu.w-list-unstyled { padding-left: 20px !important; } .w-embed:before, @@ -5866,14 +5887,12 @@ p { .searchform { position: fixed; left: 0%; - top: 0% !important; + top: 70px !important; right: 0%; bottom: auto; z-index: 150; display: none; - min-height: 100px; - padding-top: 70px; - background-color: transparent; + background-color: white; box-shadow: 0 11px 8px -8px rgba(0, 0, 0, 0.33); } .searchform .container { width: 100%; @@ -5886,7 +5905,9 @@ p { .searchform .container .row { max-width: 1240px; margin-right: auto; - margin-left: auto; } + margin-left: auto; + padding-right: 40px; + padding-left: 40px; } .button-small { margin-right: 5px; @@ -6128,6 +6149,13 @@ p { text-align: center; cursor: pointer; } + .searchform { + top: 62px !important; } + .searchform .container { + padding-top: 10px; } + .searchform .container .w-form { + margin: 0; } + .section-main.functionalities { display: block !important; } .section-main.functionalities .flexcol { @@ -6418,12 +6446,7 @@ p { margin-right: 20px; } .slide-partners { - width: 33.3333%; } - - .searchform { - padding-top: 0; } - .searchform .container { - padding-top: 25px; } } + width: 33.3333%; } } @media screen and (max-width: 767px) { h1 { font-size: 34px; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js index bd8e6fcaf..095edd387 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js +++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js @@ -31,7 +31,8 @@ // Prikaži polje za iskanje jQuery('.searchbutton').on('click', function(){ - jQuery('.searchform').css('transform', 'translate3d(0px, 0px, 0px)'); + //jQuery('.searchform').css('transform', 'translate3d(0px, 0px, 0px)'); + jQuery('.searchform').css('display', 'block'); }); // toggle glavni menu na mobile @@ -57,7 +58,8 @@ }); jQuery('.hide-search').on('click', function(){ - jQuery('.searchform').css('transform', 'translate3d(0px, -100%, 0px)'); + //jQuery('.searchform').css('transform', 'translate3d(0px, -100%, 0px)'); + jQuery('.searchform').css('display', 'none'); }); // ISKANJE diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss index a2a2ea0a8..4d2ac8905 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss @@ -2018,14 +2018,12 @@ p { .searchform { position: fixed; left: 0%; - top: 0% !important; + top: 70px !important; right: 0%; bottom: auto; z-index: 150; display: none; - min-height: 100px; - padding-top: 70px; - background-color: transparent; + background-color: white; box-shadow: 0 11px 8px -8px rgba(0, 0, 0, 0.33); .container{ @@ -2041,6 +2039,8 @@ p { max-width: 1240px; margin-right: auto; margin-left: auto; + padding-right: 40px; + padding-left: 40px; } } } @@ -2317,6 +2317,16 @@ p { cursor: pointer; } + .searchform { + top: 62px !important; + .container{ + padding-top: 10px; + .w-form{ + margin: 0; + } + } + } + .section-main{ &.functionalities{ display: block !important; @@ -2674,13 +2684,6 @@ p { .slide-partners { width: 33.3333%; } - - .searchform { - padding-top: 0; - .container{ - padding-top: 25px; - } - } } @media screen and (max-width: 767px) { diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss index c1e006aa1..41e7c0ff4 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss @@ -261,11 +261,12 @@ ol { margin-bottom: 10px; padding-left: 40px; } + .w-list-unstyled { padding-left: 0; list-style: none; - .w-list-unstyled{ + .menu.w-list-unstyled{ padding-left: 20px !important; } } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss index f678718fd..a1369dc62 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss @@ -10,6 +10,11 @@ } } +#nakupovanje-1ka{ + width: 1000px; + margin: 0 auto; +} + .accordion-toggle { max-height: 0; transition: max-height 0.3s ease-out; @@ -123,6 +128,12 @@ .month-pick{ width: 100%; } + + .sklop{ + .checkbox-field{ + padding: 0; + } + } } .desna{ @@ -132,12 +143,21 @@ flex-direction: row; .ddesna{ - width: 50%; + //width: 50%; padding-top: 50px; - padding-left: 50px; + margin-left: auto; + padding-top: 104px; + + .cena-z-ddv-text{ + font-size: 18px; + } } .dleva{ - width: 50%; + width: 54%; + + h4{ + font-size: 16px; + } } } @@ -154,6 +174,14 @@ -ms-flex-wrap: wrap; flex-wrap: wrap; + .col.packet{ + padding: 0; + + h3{ + margin: 0 !important; + } + } + &.column{ flex-direction: column; } @@ -233,6 +261,10 @@ display: flex; justify-content: space-between; + .submit-btn{ + text-transform: uppercase; + } + .nazaj{ margin-left: 25px; margin-right: 15px; @@ -335,7 +367,7 @@ &:checked + .mesec { background: #f1f1f1; - color: $modra; + color: $temo-modra; border-color: #d1d1d1; } } @@ -364,8 +396,9 @@ } .text-small { - font-style: italic; + //font-style: italic; font-size: 14px; + color: $modra; } } @@ -482,6 +515,10 @@ .mesec { width: 259px; } + + .paket{ + display: block; + } } } } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_search.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_search.scss index 58438f4d9..7d3eaae15 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_search.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_search.scss @@ -54,4 +54,8 @@ text-decoration: underline; } } -} \ No newline at end of file +} + +.iskanje-najdeno-st-zadetkov{ + color: $siva; +} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig index 5dc31799a..35d177b95 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig @@ -62,7 +62,7 @@

{% if language.id == 'sl' %} - Izbira pravega paketa glede na vrsto uporabnika + Brezplačni in napredni paketi z odločilnimi funkcionalnostmi za vse tipe uporabnikov {% else %} Choose the right package based on your user type {% endif %} @@ -80,7 +80,7 @@

-
Vsi paketi
+
Zasebni paketi
 @@ -95,7 +95,7 @@

-
All packages
+
Private packages
 @@ -114,7 +114,7 @@

Poslovni paketi omogočajo rešitve za skupine uporabnikov, kot so podjetja in organizacije.

-
Vsi paketi
+
Poslovni paketi
@@ -127,7 +127,7 @@

-
All packages
+
Business packages
@@ -427,9 +427,9 @@

{% if language.id == 'sl' %} - VSEH KREIRANIH ANKET + USTVARJENIH ANKET {% else %} - TOTAL SURVEYS CREATED + SURVEYS CREATED {% endif %}

diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig index b8ff2b5ea..4e0a44b32 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig @@ -27,7 +27,7 @@
-
+
@@ -125,18 +125,21 @@
- + +
- + +
+