From c45926b660b68b00d59b86ec692d308c0bb247d1 Mon Sep 17 00:00:00 2001 From: urospodkriznik Date: Mon, 19 Sep 2022 11:45:10 +0200 Subject: [PATCH] drupal popravki - ceniki, novice --- .../web/themes/custom/pro1ka/css/style.css | 32 +++++++++++-------- .../custom/pro1ka/sass/bacis/frontpage.scss | 1 + .../custom/pro1ka/sass/bolaric/1ka.scss | 13 +++++--- .../custom/pro1ka/sass/components/_nakup.scss | 4 ++- .../pro1ka/sass/components/_novice.scss | 13 +++++--- .../templates/page--ostale-storitve.html.twig | 10 +++--- ...page--paketi-poslovni-uporabniki.html.twig | 18 +++++------ .../templates/page--paketi-zasebni.html.twig | 16 +++++----- 8 files changed, 63 insertions(+), 44 deletions(-) diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css index 478e89e4b..25f98e757 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css +++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css @@ -530,6 +530,7 @@ body { background-color: #fff; text-align: left; } .section.uvodni-slider .slider-right { + height: 460px; position: relative; display: -webkit-box; display: -webkit-flex; @@ -1450,17 +1451,19 @@ input.error-field { min-height: 95px; } .circle_check { - margin-right: 8px; + margin-right: 2px; margin-bottom: 3px; width: 16px; } .poslovni-uporabniki.paketi .compare-descr { min-height: 168px; } -.compare-col .cta { - background: #FFA608; } - .compare-col .cta:hover { - background: #ffcb6e; } +.compare-col { + margin: auto; } + .compare-col .cta { + background: #FFA608; } + .compare-col .cta:hover { + background: #ffcb6e; } .cta { width: 100%; } @@ -2169,7 +2172,6 @@ a { -ms-flex-preferred-size: 33.333%; flex-basis: 33.333%; } .novice-page ul li .datum-novica.mesec { - color: #D1D1D1; font-size: 18px; line-height: 40px; text-transform: uppercase; } @@ -2180,8 +2182,8 @@ a { margin-right: 10px; float: left; border-radius: 50%; - background-color: #1e88e5; - color: #fff; + background-color: #D4F0FC; + color: #1e88e5; text-align: center; padding-top: 7px; } .novice-page ul li .naslov-novica { @@ -2194,7 +2196,10 @@ a { .novice-page ul li .naslov-novica a { color: #535050; } .novice-page ul li .readmore a { - color: #D1D1D1; } + color: #1E88E5; + font-weight: 600; } + .novice-page ul li .readmore a:hover { + text-decoration-line: underline; } .cenik-prikaz { margin-top: -150px; } @@ -4221,6 +4226,9 @@ p { -webkit-flex: 1; -ms-flex: 1; flex: 1; } + .container.wide { + padding-right: 20px; + padding-left: 20px; } .container.narrow { max-width: 900px; } @@ -5226,13 +5234,12 @@ p { background-color: #ffc700; color: #333; } .button-pricechart.pcb-2:hover { - background-color: #1e88e5; - color: #fff; } + background-color: #EDB900; } .button-pricechart.pcb-3 { background-color: #0040A9; } .button-pricechart.pcb-3:hover { - background-color: #1e88e5; } + background-color: #003D76; } .pricing-icon-outer { display: -webkit-box; @@ -5622,7 +5629,6 @@ p { .tab-pane-tab-1-2 { height: auto; - margin-bottom: 46px; padding-top: 105px; } .tabs-content { diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss index 4bfa9ee79..6af432ca2 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss @@ -21,6 +21,7 @@ text-align: left; .slider-right{ + height: 460px; position: relative; display: -webkit-box; display: -webkit-flex; 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 75f33ef1d..6859bf797 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss @@ -218,6 +218,11 @@ p { -webkit-flex: 1; -ms-flex: 1; flex: 1; + + &.wide{ + padding-right: 20px; + padding-left: 20px; + } } .container.narrow { @@ -1382,8 +1387,8 @@ p { color: #333; &:hover{ - background-color: #1e88e5; - color: #fff; + background-color: #EDB900; + //color: #fff; } } @@ -1391,7 +1396,7 @@ p { background-color: #0040A9; &:hover{ - background-color: #1e88e5; + background-color: #003D76; } } @@ -1844,7 +1849,7 @@ p { .tab-pane-tab-1-2 { height: auto; - margin-bottom: 46px; + //margin-bottom: 46px; padding-top: 105px; } 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 a9fac6fca..f678718fd 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss @@ -65,7 +65,7 @@ } .circle_check{ - margin-right: 8px; + margin-right: 2px; margin-bottom: 3px; width: 16px; } @@ -77,6 +77,8 @@ } .compare-col { + margin: auto; + .cta { background: $oranzna; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_novice.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_novice.scss index 905325624..0ce44afbf 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_novice.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_novice.scss @@ -23,7 +23,7 @@ flex-basis: 33.333%; .datum-novica.mesec { - color: #D1D1D1; + //color: #D1D1D1; font-size: 18px; line-height: 40px; text-transform: uppercase; @@ -36,8 +36,8 @@ margin-right: 10px; float: left; border-radius: 50%; - background-color: #1e88e5; - color: #fff; + background-color: #D4F0FC; + color: #1e88e5; text-align: center; padding-top: 7px; } @@ -57,7 +57,12 @@ .readmore { a { - color: $siva; + color: #1E88E5; + font-weight: 600; + + &:hover{ + text-decoration-line: underline; + } } } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig index 5c63fed41..aaa9af6cb 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig @@ -23,10 +23,10 @@ END HEADER #}
{% if language.id == 'sl' %}

Izbira pravega paketa glede na vrsto uporabnika

-

Individualni uporabniki lahko izbirajo med tremi zasebnimi paketi. V primeru potrebe po “white label” rešitvi in nadzoru nad večjim številom uporabnikov priporočamo poslovne pakete. +

Individualni uporabniki lahko izbirajo med tremi zasebnimi paketi. V primeru potrebe po “white label” rešitvi in nadzoru nad večjim številom uporabnikov priporočamo poslovne pakete. {% else %}

Choose the right package tailored to your needs.

-

Individual users can also choose any business package that enables white-label solutions, monitoring users in the case of a large number of users (associations, organizations, companies). In case of individual use (one user), we recommend the following packages.

+

Individual users can also choose any business package that enables white-label solutions, monitoring users in the case of a large number of users (associations, organizations, companies). In case of individual use (one user), we recommend the following packages.

{% endif %}
@@ -34,14 +34,14 @@ END HEADER #}
- +
{% if language.id == 'sl' %} Posamezniki {% else %} Individuals {% endif %}
 - +
{% if language.id == 'sl' %} Skupine {% else %} @@ -946,7 +946,7 @@ END HEADER #}
-
+
{% if language.id == 'sl' %} Cenik velja od 31. 3. 2021. Pridržujemo si pravico do spremembe brez obvestila. Vse cene so v EUR in brez DDV; če se izvedejo na fizični lokaciji uporabnika, se tarife zvišajo za 50 %. {% else %} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig index 7e15080c8..b281572c8 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig @@ -18,15 +18,15 @@
-
+
{% if language.id == 'sl' %}

Izbira pravega paketa glede na vrsto uporabnika

-

Poslovni uporabniki lahko za manjše potrebe izberejo katerikoli individualni paket (zasebni paketi). V primeru potrebe po “white label” rešitvi, nadzoru nad uporabniki v primeru večjega števila uporabnikov priporočamo katero izmed spodnjih prilagoditev.

+

Poslovni uporabniki lahko za manjše potrebe izberejo katerikoli individualni paket (zasebni paketi). V primeru potrebe po “white label” rešitvi, nadzoru nad uporabniki v primeru večjega števila uporabnikov priporočamo katero izmed spodnjih prilagoditev.

{% else %}

Choose the right package tailored to your needs.

-

Business users can choose any individual package (private packages) for smaller needs. In case of the need for a white label solution, we recommend one of the following adjustments to control the users in the case of a larger number of users.

+

Business users can choose any individual package (private packages) for smaller needs. In case of the need for a white label solution, we recommend one of the following adjustments to control the users in the case of a larger number of users.

{% endif %}
@@ -34,7 +34,7 @@
- +
{% if language.id == 'sl' %} Posamezniki {% else %} @@ -48,7 +48,7 @@ Groups {% endif %}
 - +
@@ -172,7 +172,7 @@ - {% if language.id == 'sl' %}Naročilo{% else %}Order{% endif %} + {% if language.id == 'sl' %}Naročilo{% else %}Order{% endif %}
@@ -261,7 +261,7 @@
-
+
@@ -473,7 +473,7 @@
-
+
{% if language.id == 'sl' %} Cenik velja od 1. 7. 2020. Pridržujemo si pravico do spremembe brez obvestila. Vse cene so v EUR in vključujejo DDV. {% else %} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig index 1c4c3a358..705bbdcfe 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig @@ -18,15 +18,15 @@ END HEADER #}
-
+
{% if language.id == 'sl' %}

Izbira pravega paketa glede na vrsto uporabnika

-

Individualni uporabniki lahko izbirajo med tremi zasebnimi paketi. V primeru potrebe po “white label” rešitvi in nadzoru nad večjim številom uporabnikov priporočamo poslovne pakete. +

Individualni uporabniki lahko izbirajo med tremi zasebnimi paketi. V primeru potrebe po “white label” rešitvi in nadzoru nad večjim številom uporabnikov priporočamo poslovne pakete. {% else %}

Choose the right package tailored to your needs.

-

Individual users can also choose any business package that enables white-label solutions, monitoring users in the case of a large number of users (associations, organizations, companies). In case of individual use (one user), we recommend the following packages.

+

Individual users can also choose any business package that enables white-label solutions, monitoring users in the case of a large number of users (associations, organizations, companies). In case of individual use (one user), we recommend the following packages.

{% endif %}
@@ -41,14 +41,14 @@ END HEADER #} Individuals {% endif %}
- +
{% if language.id == 'sl' %} Skupine {% else %} Groups {% endif %}
 - +
{% if language.id == 'sl' %} Ostale storitve {% else %} @@ -155,7 +155,7 @@ END HEADER #}
  • - {% if language.id == 'sl' %}Ločevanje URL po ciljnih skupinah{% else %}Groups (multiple URLs per survey){% endif %}
    + {% if language.id == 'sl' %}Ločevanje URL po skupinah{% else %}Groups (multiple URLs per survey){% endif %}
  • @@ -312,7 +312,7 @@ END HEADER #}
    • -
    +
    @@ -1476,7 +1476,7 @@ END HEADER #}
    -
    +
    {% if language.id == 'sl' %} Cenik velja od 1. 7. 2020. Pridržujemo si pravico do spremembe brez obvestila. Vse cene so v EUR in vključujejo DDV. {% else %}