merge changes

1 files changed, 40 insertions, 0 deletions

diff --git a/gn2/wqflask/static/new/css/main.css b/gn2/wqflask/static/new/css/main.css
new file mode 100644
index 00000000..d5fb8a61
--- /dev/null
+++ b/gn2/wqflask/static/new/css/main.css
@@ -0,0 +1,40 @@
+@media (max-width: 10px) {
+    .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;
+    }
+    .navbar-collapse.collapse.in {
+        display: block!important;
+    }
+    .collapsing {
+        overflow: hidden!important;
+    }
+}
+
+.checkbox {
+    min-height: 20px;
+}
\ No newline at end of file