web - minor design changes

superstes · Apr 10, 2021 · 8fc3ded · 8fc3ded
1 parent daed688
commit 8fc3ded
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/code/web/base/ga/templates/nav.html b/code/web/base/ga/templates/nav.html
@@ -47,9 +47,9 @@
                 </ul>
                 <!-- END left navbar -->
                 <!-- START right navbar -->
-                <ul class="navbar-nav ml-auto">
+                <ul class="navbar-nav ml-auto ga-nav-right">
                     {% for nav_key, nav_href in nav_right.items %}
-                        <li class="nav-item">
+                        <li class="nav-item ga-nav-right-li">
                             <a class="nav-link" href="{{ nav_href }}">{{ nav_key | safe }}</a>
                         </li>
                     {% endfor %}

diff --git a/code/web/base/ga/templates/system/script/change.html b/code/web/base/ga/templates/system/script/change.html
@@ -6,18 +6,19 @@
 
     {% set_var request|get_return_path as return_path %}
     <h3><strong>{{ script_type }} script</strong></h3>
-    <div class="alert alert-warning">If the script already exists, it will be overwritten!</div>
-    <div class="ga-sideinfo">
-        <p>
-            Current script directory: '{{ script_dir }}'
-        </p>
-    </div>
-    <br><br>
+    <br>
     <form method="post" enctype="multipart/form-data">
         {% csrf_token %}
         {{ form|as_bootstrap }}
         <input type="hidden" name="script_type" value="{{ script_type }}" />
+        <div class="alert alert-warning">If the script already exists, it will be overwritten!</div>
         {% include "../../btn/upload.html" %}
         {% include "../../btn/abort.html" %}
     </form>
+    <br><br>
+    <div class="ga-sideinfo">
+        <p>
+            Current script directory: '{{ script_dir }}'
+        </p>
+    </div>
 {% endblock %}
diff --git a/code/web/base/static/css/ga.css b/code/web/base/static/css/ga.css
@@ -286,11 +286,15 @@ form .error-msg {
     opacity: 60%;
 }
 
-.ga-icon-nav:hover {
-    opacity: 87%;
-    -webkit-transition: opacity 0.3s ease-in-out;
-    -moz-transition: opacity 0.3s ease-in-out;
-    -ms-transition: opacity 0.3s ease-in-out;
-    -o-transition: opacity 0.3s ease-in-out;
-    transition: opacity 0.3s ease-in-out;
+.ga-nav-right-li:hover .ga-icon-nav {
+    color: rgb(195, 188, 49);
+    -webkit-transition: color 0.3s ease-in-out;
+    -moz-transition: color 0.3s ease-in-out;
+    -ms-transition: color 0.3s ease-in-out;
+    -o-transition: color 0.3s ease-in-out;
+    transition: color 0.3s ease-in-out;
+}
+
+.ga-nav-right-li:hover .ga-icon-logout {
+    color: #B00020;
 }
diff --git a/code/web/base/static/css/ga_mobile.css b/code/web/base/static/css/ga_mobile.css
@@ -23,6 +23,19 @@
         text-transform: uppercase;
     }
 
+    .ga-nav-right {
+        flex-direction: row !important;
+        align-items: center;
+        justify-content: center;
+        border-top: 2px solid rgba(255, 255, 255, 0.6);
+        margin-top: 10px;
+    }
+
+    .ga-nav-right-li {
+        padding-left: 8px;
+        padding-right: 8px;
+    }
+
 }
 
 @media only screen and (max-width: 801px) {  /* tablets */