From e15815e0fe96f2ec39f68428ec117b817034ba01 Mon Sep 17 00:00:00 2001
From: Jared Dillard <jdillard@netgate.com>
Date: Wed, 25 Nov 2015 17:01:41 -0600
Subject: apply hamburger nav change to main pfsense css

---
 src/usr/local/www/bootstrap/css/pfSense-dark.css | 45 +++---------------------
 src/usr/local/www/bootstrap/css/pfSense.css      | 42 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 41 deletions(-)

(limited to 'src/usr/local/www/bootstrap')

diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/bootstrap/css/pfSense-dark.css
index 6c55111..2f73541 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-dark.css
+++ b/src/usr/local/www/bootstrap/css/pfSense-dark.css
@@ -180,6 +180,10 @@ caption {
 	border-color: #424242;
 }
 
+.panel-footer {
+    background-color: #424242;
+}
+
 .alert-warning {
 	color: #6D4C41;
     background-color: #FFF9C4;
@@ -310,45 +314,4 @@ button.close {
     border: 1px solid #6D4C41;
     border-radius: 5px;
     box-shadow: 1px 1px 1px #6D4C41;
-}
-
-@media (max-width: 1200px) {
-    .navbar-header {
-        float: none;
-    }
-    .navbar-toggle {
-        display: block;
-    }
-    .navbar-collapse {
-        border-top: 1px solid transparent;
-        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
-    }
-    .navbar-collapse.collapse {
-        display: none!important;
-    }
-    .navbar-nav {
-        float: none!important;
-        margin: 7.5px -15px;
-    }
-    .navbar-nav>li {
-        float: none;
-    }
-    .navbar-nav>li>a {
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-    .navbar-text {
-        float: none;
-        margin: 15px 0;
-    }
-    /* since 3.1.0 */
-    .navbar-collapse.collapse.in { 
-        display: block!important;
-    }
-    .collapsing {
-        overflow: hidden!important;
-    }
-    .navbar-fixed-bottom .navbar-collapse, .navbar-fixed-top .navbar-collapse {
-    	max-height: none !important;
-    }
 }
\ No newline at end of file
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css
index 23a974b..6777d05 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/bootstrap/css/pfSense.css
@@ -393,3 +393,45 @@ textarea
 	-moz-tab-size: 4;
 	-o-tab-size: 4;
 }
+
+@media (max-width: 1200px) {
+	/* change top navbar from horizontal to vertical */
+    .navbar-header {
+        float: none;
+    }
+    .navbar-toggle {
+        display: block;
+    }
+    .navbar-collapse {
+        border-top: 1px solid transparent;
+        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+    }
+    .navbar-collapse.collapse {
+        display: none!important;
+    }
+    .navbar-nav {
+        float: none!important;
+        margin: 7.5px -15px;
+    }
+    .navbar-nav>li {
+        float: none;
+    }
+    .navbar-nav>li>a {
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+    .navbar-text {
+        float: none;
+        margin: 15px 0;
+    }
+    /* since 3.1.0 */
+    .navbar-collapse.collapse.in { 
+        display: block!important;
+    }
+    .collapsing {
+        overflow: hidden!important;
+    }
+    .navbar-fixed-bottom .navbar-collapse, .navbar-fixed-top .navbar-collapse {
+    	max-height: none !important;
+    }
+}
-- 
cgit v1.1