From df009f6c69599fb5b19c4f30cf8e4c08031fd4ad Mon Sep 17 00:00:00 2001 From: urospodkriznik Date: Tue, 4 Oct 2022 12:44:49 +0200 Subject: [PATCH] drupal - responsive in popravki po andreji --- .../web/themes/custom/pro1ka/css/style.css | 37 ++++++-- .../custom/pro1ka/sass/bacis/frontpage.scss | 7 ++ .../custom/pro1ka/sass/bolaric/1ka.scss | 21 +++++ .../pro1ka/sass/bolaric/components.scss | 4 + .../custom/pro1ka/sass/components/_popup.scss | 7 +- .../themes/custom/pro1ka/svg/1ka_logo_en.svg | 54 ++++++------ .../themes/custom/pro1ka/svg/1ka_logo_sl.svg | 52 +++++------ .../themes/custom/pro1ka/svg/steps-01-en.svg | 50 +++++++++++ .../themes/custom/pro1ka/svg/steps-01-sl.svg | 76 +++++++++++----- .../themes/custom/pro1ka/svg/steps-02-en.svg | 50 +++++++++++ .../themes/custom/pro1ka/svg/steps-02-sl.svg | 72 +++++++++++----- .../themes/custom/pro1ka/svg/steps-03-en.svg | 50 +++++++++++ .../themes/custom/pro1ka/svg/steps-03-sl.svg | 86 +++++++++++++------ .../pro1ka/templates/page--front.html.twig | 48 +++++------ .../pro1ka/templates/parts/footer.html.twig | 2 +- 15 files changed, 447 insertions(+), 169 deletions(-) create mode 100644 frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-en.svg create mode 100644 frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-en.svg create mode 100644 frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-en.svg diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css index 735a6d3a3..0f69f8fc6 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css +++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css @@ -917,10 +917,15 @@ body { padding-left: 25px; -webkit-box-flex: 1; -webkit-flex: 1; - -ms-flex: 1; } + -ms-flex: 1; + min-width: 200px; } .stolpec-4.logotipi img { height: 60px; - margin: 0.75rem 0; } + margin: 0.75rem 0; + margin-right: 20px; } + .stolpec-4.logotipi img.fdv { + width: 214px; + height: auto; } .stolpec-4 .fotter-ico { width: 40px; height: 40px; } @@ -1242,14 +1247,13 @@ ul.seznam-tem { font-weight: 600; margin-bottom: 14px; } .dva-stolpca .preko-racunov { - border-left: 1px solid #d1d1d1; } + border-left: 1px solid #d1d1d1; + width: 100%; } .dva-stolpca .preko-racunov .ostale-prijave { display: flex; - flex-direction: column; - width: 300px; } + flex-direction: column; } .dva-stolpca .preko-racunov .ostale-prijave .op-gumb { - margin-left: auto; - margin-right: auto; + margin-left: 25px; margin-bottom: 16px; text-transform: uppercase; color: #1e88e5; @@ -1298,10 +1302,12 @@ ul.seznam-tem { padding-right: 1rem; float: left; } .dva-stolpca .registracija { - padding-right: 1rem; } + padding-right: 1rem; + min-width: 310px; } .dva-stolpca .prijava.forma { padding-right: 1rem; - width: 100%; } + width: 100%; + min-width: 300px; } .dva-stolpca .error-message { background: rgba(255, 0, 0, 0.1); padding: 0.25rem 0.75rem; @@ -2592,6 +2598,8 @@ ol { .w-list-unstyled { padding-left: 0; list-style: none; } + .w-list-unstyled .w-list-unstyled { + padding-left: 20px !important; } .w-embed:before, .w-embed:after { @@ -4391,6 +4399,10 @@ p { -webkit-flex: 0 0 33.3333%; -ms-flex: 0 0 33.3333%; flex: 0 0 33.3333%; } + .col._4-12-12-12 p { + flex-grow: 1; } + .col._4-12-12-12 .buttons-row { + margin-top: 30px; } .col._6-12-12-12 { -webkit-box-flex: 0; @@ -4429,6 +4441,13 @@ p { -webkit-flex: 0 25%; -ms-flex: 0 25%; flex: 0 25%; } + .col._3-6-6-12 .center { + display: flex; + flex-direction: column; } + .col._3-6-6-12 .center p { + flex-grow: 1; } + .col._3-6-6-12 .center .buttons-row { + margin-top: 20px; } .col._6-6-6-12 { -webkit-box-flex: 0; 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 4ca499857..5d5f54d4a 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/frontpage.scss @@ -510,11 +510,18 @@ -webkit-box-flex: 1; -webkit-flex: 1; -ms-flex: 1; + min-width: 200px; &.logotipi{ img{ height: 60px; margin: 0.75rem 0; + margin-right: 20px; + + &.fdv{ + width: 214px; + height: auto; + } } } 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 1ff1be974..a2a2ea0a8 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/1ka.scss @@ -307,6 +307,14 @@ p { -webkit-flex: 0 0 33.3333%; -ms-flex: 0 0 33.3333%; flex: 0 0 33.3333%; + + p{ + flex-grow: 1; + } + + .buttons-row{ + margin-top: 30px; + } } .col._6-12-12-12 { @@ -351,6 +359,19 @@ p { -webkit-flex: 0 25%; -ms-flex: 0 25%; flex: 0 25%; + + .center{ + display: flex; + flex-direction: column; + + p{ + flex-grow: 1; + } + + .buttons-row{ + margin-top: 20px; + } + } } .col._6-6-6-12 { 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 702909516..c1e006aa1 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bolaric/components.scss @@ -264,6 +264,10 @@ ol { .w-list-unstyled { padding-left: 0; list-style: none; + + .w-list-unstyled{ + padding-left: 20px !important; + } } .w-embed:before, .w-embed:after { diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss index 0fed3c0a8..b7d897364 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss @@ -334,15 +334,14 @@ .preko-racunov { //padding-left: 1rem; border-left: 1px solid #d1d1d1; + width: 100%; .ostale-prijave { display: flex; flex-direction: column; - width: 300px; .op-gumb{ - margin-left: auto; - margin-right: auto; + margin-left: 25px; margin-bottom: 16px; text-transform: uppercase; @@ -419,11 +418,13 @@ .registracija { padding-right: 1rem; + min-width: 310px; } .prijava.forma { padding-right: 1rem; width: 100%; + min-width: 300px; } .error-message { diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg index 6f616038a..81b977266 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg @@ -1,32 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_sl.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_sl.svg index 6f616038a..e53c1d450 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_sl.svg +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_sl.svg @@ -1,32 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-en.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-en.svg new file mode 100644 index 000000000..3d91dac03 --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-en.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-sl.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-sl.svg index a5a4bbb5a..2995cef0b 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-sl.svg +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-01-sl.svg @@ -1,38 +1,68 @@ - - + + - + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - - + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-en.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-en.svg new file mode 100644 index 000000000..725d77188 --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-en.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-sl.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-sl.svg index ffe8f2844..5ed1d7b4a 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-sl.svg +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-02-sl.svg @@ -1,34 +1,64 @@ - - + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - + - - - - + + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-en.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-en.svg new file mode 100644 index 000000000..3f31223d8 --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-en.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-sl.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-sl.svg index 6b20467b8..acd39863f 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-sl.svg +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/steps-03-sl.svg @@ -1,40 +1,70 @@ - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + 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 c9f452e27..5dc31799a 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 @@ -35,7 +35,7 @@ {% if language.id == 'sl' %} ZMOGLJIVO, HITRO IN ENOSTAVNO ORODJE ZA ANKETIRANJE {% else %} - POWERFUL, FAST AND INTUITIVE WEB SURVEZ SOFTWARE + POWERFUL, FAST AND INTUITIVE WEB SURVEY SOFTWARE {% endif %}

@@ -284,17 +284,17 @@
- -
+ + {#
{% if language.id == 'sl' %} USTVARI VPRAŠALNIK {% else %} CREATE THE SURVEY {% endif %} -
-
+
#} + {#
-
+
#}

{% if language.id == 'sl' %} @@ -309,17 +309,17 @@

- -
+ + {#
{% if language.id == 'sl' %} OBJAVITE POVEZAVO {% else %} SHARE THE SURVEY LINK {% endif %} -
-
+
#} + {#
-
+
#}

@@ -334,17 +334,17 @@

- -
+ + {#
{% if language.id == 'sl' %} ANALIZIRAJTE REZULTATE {% else %} ANALYSE THE RESULTS {% endif %} -
-
+
#} + {#
-
+
#}

@@ -537,7 +537,7 @@

{% if language.id == 'sl' %} - S spletno anketo 1KA, smo v našem zavodu občutno povečali delež vrnjenih anket v primerjavi s preteklim anketiranjem. + S spletno anketo 1KA smo v našem zavodu občutno povečali delež vrnjenih anket v primerjavi s preteklim anketiranjem. {% else %} With the 1KA online survey, we have significantly increased the return rate in our institution compared to previous surveys. {% endif %} @@ -619,7 +619,7 @@

NEWS

Comitted to providing the best possible experience, news about our product are shared frequently.

- +
Read more
 @@ -640,7 +640,7 @@

O 1KA

1KA je aplikacija, ki omogoča enostavno in dostopno spletno anketiranje.

- +
Preberi več
 @@ -649,7 +649,7 @@

ABOUT 1KA

1KA is a web survey software that makes survey creation easy and accessible.

- +
Read more
 @@ -669,7 +669,7 @@

1KA PODPORA

Ste ob izdelavi ankete naleteli na težavo? Kontaktirajte našo podporo uporabnikov.

- +
Preberi več
 @@ -678,7 +678,7 @@

1KA SUPPORT

Encountered a problem while creating your survey? Contact our customer support.

- +
Read more
 @@ -699,7 +699,7 @@

KAKO DELUJE?

Vsem uporabnikom so na voljo priročniki, video vodiči in odgovori na pogosta vprašanja.

- +
Preberi več
 @@ -708,7 +708,7 @@

HOW DOES IT WORK?

Manuals, video guides and answers to frequently asked questions are available to all users.

- +
Read more
 diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig index 48a8b0990..768f1594e 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig @@ -114,7 +114,7 @@ - +