Merge pull request #1404 from mozilla/tabnav_fix

Resolves the tab-nav issue in themes.
mozilla · Jul 30, 2019 · f530f22 · f530f22
2 parents 3049f3e + 8f9ce17
commit f530f22
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 40 deletions.
diff --git a/meteor/client/themes/side_nav_dark/menu.html b/meteor/client/themes/side_nav_dark/menu.html
@@ -7,7 +7,7 @@
 
 
 <template name="side_nav_menu">
-    <div class="container itemcontainer">
+    <div class="container headercontainer">
       <nav class="main-menu">
       {{#if true }}
         <ul>

diff --git a/meteor/imports/themes/classic/mozdef.css b/meteor/imports/themes/classic/mozdef.css
@@ -287,19 +287,6 @@ caption, legend {
     color: var(--txt-secondary-color);
 }
 
-/* incident/investigation styles */
-.daterangepicker, .daterangepicker td {
-    color: var(--txt-secondary-color);
-}
-
-.tabcontent {
-    display: none;
-}
-
-.tabcontent.active {
-    display: block;
-}
-
 textarea {
     overflow: auto;
     vertical-align: top;
@@ -389,9 +376,14 @@ td {
 }
 
 .tabcontent {
+    display: none;
     margin-top: 20px;
 }
 
+.tabcontent.active {
+    display: block;
+}
+
 .tabnav a {
     color: rgb(173, 216, 230);
 }

diff --git a/meteor/imports/themes/dark/mozdef.css b/meteor/imports/themes/dark/mozdef.css
@@ -343,12 +343,12 @@ td {
 
 
 .welcome {
-    height: 180px;
-    width: 600px;
-    margin-left: 25%;
-    text-align: center;
-    color: var(--txt-primary-color);
-    vertical-align: middle;
+  height: 180px;
+  width: 600px;
+  margin-left: 25%;
+  text-align: center;
+  color: var(--txt-primary-color);
+  vertical-align: middle;
 }
 
 .mozdeflogo{
@@ -357,11 +357,16 @@ td {
 }
 
 .tabcontent {
-    margin-top: 20px;
+  display: none;
+  margin-top: 20px;
+}
+
+.tabcontent.active {
+  display: block;
 }
 
 .tabnav a {
-    color: lightblue;
+  color: lightblue;
 }
 
 /* uncomment this login ui css to hide the local account/password signup options

diff --git a/meteor/imports/themes/light/mozdef.css b/meteor/imports/themes/light/mozdef.css
@@ -260,14 +260,6 @@ caption, legend {
     color: var(--txt-primary-color);
 }
 
-.tabcontent {
-    display: none;
-}
-
-.tabcontent.active {
-    display: block;
-}
-
 textarea {
     overflow: auto;
     vertical-align: top;
@@ -343,12 +335,12 @@ td {
 }
 
 .welcome {
-    height: 180px;
-    width: 600px;
-    margin-left: 25%;
-    text-align: center;
-    color: var(--txt-primary-color);
-    vertical-align: middle;
+  height: 180px;
+  width: 600px;
+  margin-left: 25%;
+  text-align: center;
+  color: var(--txt-primary-color);
+  vertical-align: middle;
 }
 
 .mozdeflogo{
@@ -357,11 +349,16 @@ td {
 }
 
 .tabcontent {
-    margin-top: 20px;
+  display: none;
+  margin-top: 20px;
+}
+
+.tabcontent.active {
+  display: block;
 }
 
 .tabnav a {
-    color: lightblue;
+  color: lightblue;
 }
 
 /* don't float the 'create account' link*/

diff --git a/meteor/imports/themes/side_nav_dark/mozdef.css b/meteor/imports/themes/side_nav_dark/mozdef.css
@@ -416,8 +416,13 @@ td{
   width: 500px;
 }
 
-.tabcontent{
-    margin-top: 20px;
+.tabcontent {
+  display: none;
+  margin-top: 20px;
+}
+
+.tabcontent.active {
+  display: block;
 }
 
 .tabnav a{