From b24dc1865367d152accb29ce6bb0300b70281006 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Mon, 8 Nov 2021 16:16:59 +0100
Subject: [PATCH] Redisign - levi meni

---
 admin/survey/redesign_test.php                | 16 +++----
 public/css/admin_new.css                      | 39 ++++++++++++++++-
 resources/sass/admin_new/basic/colors.scss    |  1 +
 .../sass/admin_new/components/main/main.scss  |  5 +++
 .../admin_new/components/main/menu_left.scss  | 43 ++++++++++++++++++-
 5 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/admin/survey/redesign_test.php b/admin/survey/redesign_test.php
index d1d79373a..643eb1d56 100644
--- a/admin/survey/redesign_test.php
+++ b/admin/survey/redesign_test.php
@@ -55,12 +55,12 @@
                                     Posamezna stran
                                 </li>
 
-                                <li>
-                                    Posamezna stran
+                                <li class="active">
+                                    Aktivna stran
                                 </li>
 
                                 <li>
-                                    Posamezna stran
+                                    <a class="menu-left" href="https://www.1ka.si/">1ka.si</a>
                                 </li>
 
                                 <li>
@@ -68,11 +68,11 @@
                                 </li>
                             </ul>
 
-                            <span class="menu_left-title">
-                                Naslov menija
+                            <span class="menu_left-title paid">
+                                Plačljivi modul
                             </span>
                                     
-                            <ul class="menu_left-list">
+                            <ul class="menu_left-list paid">
                                 <li>
                                     Posamezna stran
                                 </li>
@@ -82,11 +82,11 @@
                                 </li>
 
                                 <li>
-                                    Posamezna stran
+                                    Posamezna stran 0123456789
                                 </li>
 
                                 <li>
-                                    Posamezna stran
+                                    Posamezna stran z zelo dolgim imenom
                                 </li>                                                                                          
                             </ul>
                             
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 97cde83d5..0e2e60b86 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5103,11 +5103,44 @@ footer {
 }
 
 div.left {
-  padding: 32px;
+  padding: 16px 32px;
   border: 1px solid #E5E5E5;
   box-sizing: border-box;
   box-shadow: -10px 10px 0px #F8F8F8;
   margin-right: 64px;
+  height: fit-content;
+}
+
+span.menu_left-title {
+  font-weight: bold;
+  font-size: 17px;
+  line-height: 21px;
+  text-transform: uppercase;
+}
+span.menu_left-title.paid {
+  color: #FFC700;
+}
+
+ul.menu_left-list {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 32px;
+  font-size: 16px;
+}
+ul.menu_left-list.paid {
+  color: #707070;
+  pointer-events: none;
+}
+ul.menu_left-list li {
+  line-height: 20px;
+  margin-top: 12px;
+}
+ul.menu_left-list li:hover {
+  color: #1E88E5;
+}
+ul.menu_left-list li.active {
+  color: #1E88E5;
 }
 
 a {
@@ -5118,6 +5151,10 @@ a {
 a:hover {
   color: #166dba;
 }
+a.menu-left {
+  color: inherit;
+  text-decoration: none;
+}
 
 /* 
     Form scss - input fields, buttons...
diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss
index a232b01e2..16ff71810 100644
--- a/resources/sass/admin_new/basic/colors.scss
+++ b/resources/sass/admin_new/basic/colors.scss
@@ -9,6 +9,7 @@ $blue: #1E88E5;
 $black: #333333;
 $white: #FFFFFF;
 
+$very-dark-gray: #707070;
 $dark-gray: #C4C4C4;
 $gray: #E5E5E5;
 $light-gray: #F8F8F8;
diff --git a/resources/sass/admin_new/components/main/main.scss b/resources/sass/admin_new/components/main/main.scss
index 4c3963cfb..cd01d60f2 100644
--- a/resources/sass/admin_new/components/main/main.scss
+++ b/resources/sass/admin_new/components/main/main.scss
@@ -8,4 +8,9 @@ a {
     &:hover {
         color: darken($blue, 10%);
     }
+
+    &.menu-left {
+        color: inherit;
+        text-decoration: none;
+    }
 }
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/main/menu_left.scss b/resources/sass/admin_new/components/main/menu_left.scss
index a9031029c..3b2c3a7a1 100644
--- a/resources/sass/admin_new/components/main/menu_left.scss
+++ b/resources/sass/admin_new/components/main/menu_left.scss
@@ -1,7 +1,48 @@
 div.left{
-    padding: 32px;
+    padding: 16px 32px;
     border: 1px solid $gray;
     box-sizing: border-box;
     box-shadow: -10px 10px 0px $light-gray;
     margin-right: 64px;
+    
+    height: fit-content;
+}
+
+span.menu_left-title {
+    font-weight: bold;
+    font-size: 17px;
+    line-height: 21px;
+    
+    text-transform: uppercase;
+
+    &.paid {
+        color: $yellow;
+        //manjka ključavnica pri plačjivih modulih
+    }
+}
+
+ul.menu_left-list {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    margin-bottom: 32px;
+    font-size: 16px;
+
+    &.paid {
+        color: $very-dark-gray;
+        pointer-events: none;
+    }
+
+    & li {
+        line-height: 20px;
+        margin-top: 12px;
+
+        &:hover{
+            color: $blue;
+        }
+        
+        &.active{
+            color: $blue;
+        }
+    }
 }
\ No newline at end of file