From c95ff3fcc5135212b782e71fcde39c4092322c21 Mon Sep 17 00:00:00 2001
From: urospodkriznik <uros.podkriznik@gmail.com>
Date: Fri, 2 Sep 2022 17:37:45 +0200
Subject: [PATCH] drupal: - prevod gumbov prijava in registracija v ang - dodan
 text nad email prijavo - menjani gumbi ya ostalo prijavo (lahko da kaj ne
 dela, ker zaradi drupal napak nisem mogel testirat)

---
 .../templates/prijava-block.html.twig         | 12 ++++-----
 .../templates/registracija-block.html.twig    |  8 +++---
 .../web/themes/custom/pro1ka/css/style.css    | 21 +++++++++++++--
 .../custom/pro1ka/sass/components/_popup.scss | 26 ++++++++++++++++++-
 .../custom/pro1ka/svg/facebook_logo.svg       |  8 ++++++
 .../themes/custom/pro1ka/svg/google_logo.svg  |  9 +++++++
 .../pro1ka/templates/parts/header.html.twig   | 15 +++++++++--
 7 files changed, 84 insertions(+), 15 deletions(-)
 create mode 100644 frontend/drupal9/web/themes/custom/pro1ka/svg/facebook_logo.svg
 create mode 100644 frontend/drupal9/web/themes/custom/pro1ka/svg/google_logo.svg

diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
index 1146db588..12c79718b 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
@@ -68,7 +68,7 @@
 {#                    // Naslov#}
                     <div class="row">
                         <div class="col">
-                            <h4>{{ title_register_new_eamil }}</h4>
+                            <h4>{{ lang['cms_register_new_user_email'] }}</h4>
                         </div>
                         <div class="col nakup-prijava">
                             {{ lang['cms_buy_login_description'] }}
@@ -135,15 +135,15 @@
                     <div class="ostale-prijave">
 
                         <div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
-                            <div class="gumb">
-                                <img alt="{{ lang['login_with_facebook'] }}" src="/tema1ka/svg/prijava-facebook.svg"/>
+                            <div class="op-gumb">
+                                <img alt="{{ lang['login_with_facebook'] }}" src="/tema1ka/svg/facebook_logo.svg"/>
                                  {{ lang['login_with_facebook'] }}
                             </div>
                         </div>
 
-                        <div class="ikona ikona-custom-login  ikona-google" data-login="google">
-                            <div class="gumb">
-                                <img alt="{{ lang['login_with_google'] }}" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/>
+                        <div class="ikona ikona-custom-login ikona-google" data-login="google">
+                            <div class="op-gumb">
+                                <img alt="{{ lang['login_with_google'] }}" src="/tema1ka/svg/google_logo.svg" style="height: 1.5rem;"/>
                                 {{ lang['login_with_google'] }}
                             </div>
                         </div>
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
index f81911f9f..494e05a87 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
@@ -109,15 +109,15 @@
                     <div class="ostale-prijave">
 
                         <div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
-                            <div class="gumb">
-                                <img alt="{{ lang['login_with_facebook'] }}" src="/tema1ka/svg/prijava-facebook.svg"/>
+                            <div class="op-gumb">
+                                <img alt="{{ lang['login_with_facebook'] }}" src="/tema1ka/svg/facebook_logo.svg"/>
                                 {{  lang['login_with_facebook'] }}
                             </div>
                         </div>
 
                         <div class="ikona ikona-custom-login  ikona-google" data-login="google">
-                            <div class="gumb">
-                                <img alt="{{ lang['login_with_google'] }}" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/>
+                            <div class="op-gumb">
+                                <img alt="{{ lang['login_with_google'] }}" src="/tema1ka/svg/google_logo.svg" style="height: 1.5rem;"/>
                                 {{ lang['login_with_google'] }}
                             </div>
                         </div>
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
index caa4cfc0d..691153e12 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
+++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
@@ -1240,10 +1240,27 @@ ul.seznam-tem {
       display: flex;
       flex-direction: column;
       width: 300px; }
-      .dva-stolpca .preko-racunov .ostale-prijave .gumb {
+      .dva-stolpca .preko-racunov .ostale-prijave .op-gumb {
         margin-left: auto;
         margin-right: auto;
-        margin-bottom: 16px; }
+        margin-bottom: 16px;
+        color: #1e88e5;
+        border: 1px solid #1e88e5;
+        padding: 11px 7px 11px 17px;
+        background: #ffffff;
+        padding: 0.5rem 1rem;
+        max-width: 250px;
+        font-weight: 600;
+        letter-spacing: 1px;
+        cursor: pointer;
+        transition: 0.2s; }
+        .dva-stolpca .preko-racunov .ostale-prijave .op-gumb:hover {
+          background: #f8f8f8; }
+        .dva-stolpca .preko-racunov .ostale-prijave .op-gumb img {
+          height: 1.6rem;
+          width: 52px;
+          padding-right: 1rem;
+          float: left; }
       .dva-stolpca .preko-racunov .ostale-prijave .aai-prijava-small {
         font-size: 0.8rem;
         line-height: 1.2;
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 8868a8d29..4b3d397d1 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
@@ -333,10 +333,34 @@
       flex-direction: column;
       width: 300px;
 
-      .gumb{
+      .op-gumb{
         margin-left: auto;
         margin-right: auto;
         margin-bottom: 16px;
+
+        color: #1e88e5;
+        border: 1px solid #1e88e5;
+        padding: 11px 7px 11px 17px;
+
+        background: #ffffff;
+        padding: 0.5rem 1rem;
+        max-width: 250px;
+        font-weight: 600;
+        letter-spacing: 1px;
+        cursor: pointer;
+
+        transition: 0.2s;
+
+        &:hover {
+          background: #f8f8f8;
+        }
+
+        img {
+          height: 1.6rem;
+          width: 52px;
+          padding-right: 1rem;
+          float: left;
+        }
       }
 
       .aai-prijava-small{
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/facebook_logo.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/facebook_logo.svg
new file mode 100644
index 000000000..e0dc0810e
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/facebook_logo.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 40 40">
+  <linearGradient id="a" x1="-277.375" x2="-277.375" y1="406.6018" y2="407.5726" gradientTransform="matrix(40 0 0 -39.7778 11115.001 16212.334)" gradientUnits="userSpaceOnUse">
+    <stop offset="0" stop-color="#0062e0"/>
+    <stop offset="1" stop-color="#19afff"/>
+  </linearGradient>
+  <path fill="url(#a)" d="M16.7 39.8C7.2 38.1 0 29.9 0 20 0 9 9 0 20 0s20 9 20 20c0 9.9-7.2 18.1-16.7 19.8l-1.1-.9h-4.4l-1.1.9z"/>
+  <path fill="#fff" d="m27.8 25.6.9-5.6h-5.3v-3.9c0-1.6.6-2.8 3-2.8H29V8.2c-1.4-.2-3-.4-4.4-.4-4.6 0-7.8 2.8-7.8 7.8V20h-5v5.6h5v14.1c1.1.2 2.2.3 3.3.3 1.1 0 2.2-.1 3.3-.3V25.6h4.4z"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/google_logo.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/google_logo.svg
new file mode 100644
index 000000000..5ad04c392
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/google_logo.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1, 0, 0, 1, 27.009001, -39.238998)">
+    <path fill="#4285F4" d="M -3.264 51.509 C -3.264 50.719 -3.334 49.969 -3.454 49.239 L -14.754 49.239 L -14.754 53.749 L -8.284 53.749 C -8.574 55.229 -9.424 56.479 -10.684 57.329 L -10.684 60.329 L -6.824 60.329 C -4.564 58.239 -3.264 55.159 -3.264 51.509 Z"/>
+    <path fill="#34A853" d="M -14.754 63.239 C -11.514 63.239 -8.804 62.159 -6.824 60.329 L -10.684 57.329 C -11.764 58.049 -13.134 58.489 -14.754 58.489 C -17.884 58.489 -20.534 56.379 -21.484 53.529 L -25.464 53.529 L -25.464 56.619 C -23.494 60.539 -19.444 63.239 -14.754 63.239 Z"/>
+    <path fill="#FBBC05" d="M -21.484 53.529 C -21.734 52.809 -21.864 52.039 -21.864 51.239 C -21.864 50.439 -21.724 49.669 -21.484 48.949 L -21.484 45.859 L -25.464 45.859 C -26.284 47.479 -26.754 49.299 -26.754 51.239 C -26.754 53.179 -26.284 54.999 -25.464 56.619 L -21.484 53.529 Z"/>
+    <path fill="#EA4335" d="M -14.754 43.989 C -12.984 43.989 -11.404 44.599 -10.154 45.789 L -6.734 42.369 C -8.804 40.429 -11.514 39.239 -14.754 39.239 C -19.444 39.239 -23.494 41.939 -25.464 45.859 L -21.484 48.949 C -20.534 46.099 -17.884 43.989 -14.754 43.989 Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
index f658d7994..2952dd0a7 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
@@ -70,9 +70,20 @@
                   </div>
                 </div>
               </div>
+            {% elseif language.id == 'sl' %}
+              <a href="#" id="modal-open-login" class="login">              
+                Prijava
+                </a>
+              <a href="#" id="modal-open-registration"class="register w-button">
+                Registracija
+              </a>
             {% else %}
-              <a href="#" id="modal-open-login" class="login">Prijava</a>
-              <a href="#" id="modal-open-registration"class="register w-button">Registracija</a>
+              <a href="#" id="modal-open-login" class="login">              
+                Login
+                </a>
+              <a href="#" id="modal-open-registration"class="register w-button">
+                Registration
+              </a>
             {% endif %}
           </div>