moved project "Results" tab to end and made it stand out with a dark …

…background UAT #62
dssg · Jan 28, 2021 · f90c256 · f90c256
1 parent 60a13ab
commit f90c256
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/marketplace/static/css/dssgsolve.css b/src/marketplace/static/css/dssgsolve.css
@@ -85,6 +85,20 @@ body {
   margin: -125px 0 0;  /* negative fixed header height */
 }
 
+.nav-tabs .nav-link.nav-dark {
+  color: #fff;
+  background-color: #80a415;
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+}
+.nav-tabs .nav-link.nav-dark:hover {
+  background-color: #5d770f;
+}
+.nav-tabs .nav-link.nav-dark.active {
+  color: #fff;
+  background-color: #5d770f;
+}
+
 .footer {
   background-color: #ABCF38;
   color: white;

diff --git a/src/marketplace/templates/marketplace/components/project_tabs.html b/src/marketplace/templates/marketplace/components/project_tabs.html
@@ -1,7 +1,6 @@
-
 {% load rules %}
-<ul class="nav nav-tabs">
 
+<ul class="nav nav-tabs">
     <li class="nav-item">
       {% if page_tab == 'info' %}
         <span class="nav-link active">Information</span>
@@ -26,16 +25,6 @@
     {% endif %}
   </li>
 
-  {% if project.is_completed %}
-    <li class="nav-item">
-      {% if page_tab == 'deliverables' %}
-        <span class="nav-link active">Results</span>
-      {% else %}
-        <a class="nav-link" href="{% url 'marketplace:proj_deliverables' project.id %}">Results</a>
-      {% endif %}
-    </li>
-  {% endif %}
-
   {% has_perm 'project.tasks_view' user project as perm_tasks_view %}
   {% if perm_tasks_view %}
     <li class="nav-item">
@@ -91,4 +80,13 @@
     </li>
   {% endif %}
 
+  {% if project.is_completed %}
+    <li class="nav-item">
+      {% if page_tab == 'deliverables' %}
+        <span class="nav-link nav-dark active">Results</span>
+      {% else %}
+        <a class="nav-link nav-dark" href="{% url 'marketplace:proj_deliverables' project.id %}">Results</a>
+      {% endif %}
+    </li>
+  {% endif %}
 </ul>