fix icon in nav-bar

zloban · Dec 3, 2012 · 314a51c · 314a51c
1 parent 60cabe6
commit 314a51c
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 6 deletions.
diff --git a/less/menus.less b/less/menus.less
@@ -59,6 +59,7 @@
     }
 }
 
+
 .nav-bar {
     background-color: @blue;
     position: relative;
@@ -69,22 +70,41 @@
     padding: 0;
 
     .nav-bar-inner {
-        .element {
+        .element, a .element {
             position: relative;
             margin: 5px;
             line-height: 20px;
             height: 20px;
             float: left;
             display: inline-block;
             padding: 0;
-            margin-right: 10px;
             font-weight: normal;
             font-size: 10pt;
             color: #fff;
 
             &.brand {
                 font-size: 1.15em;
             }
+
+            img {
+                height: 100%;
+            }
+
+            a {
+                line-height: 20px;
+                height: 20px;
+                font-size: 10pt;
+                //color: #fff;
+            }
+
+            [class^="icon-"]:before, [class*=" icon-"]:before {
+                display: inline-block;
+                margin: 0;
+                padding: 0;
+                display: block;
+                float: left;
+                margin: 0 5px;
+            }
         }
 
         & > ul.menu {

diff --git a/public/css/modern.css b/public/css/modern.css
@@ -3807,22 +3807,44 @@ table.bordered tbody tr:last-child td {
 .nav-bar .nav-bar-inner {
   *zoom: 1;
 }
-.nav-bar .nav-bar-inner .element {
+.nav-bar .nav-bar-inner .element,
+.nav-bar .nav-bar-inner a .element {
   position: relative;
   margin: 5px;
   line-height: 20px;
   height: 20px;
   float: left;
   display: inline-block;
   padding: 0;
-  margin-right: 10px;
   font-weight: normal;
   font-size: 10pt;
   color: #fff;
 }
-.nav-bar .nav-bar-inner .element.brand {
+.nav-bar .nav-bar-inner .element.brand,
+.nav-bar .nav-bar-inner a .element.brand {
   font-size: 1.15em;
 }
+.nav-bar .nav-bar-inner .element img,
+.nav-bar .nav-bar-inner a .element img {
+  height: 100%;
+}
+.nav-bar .nav-bar-inner .element a,
+.nav-bar .nav-bar-inner a .element a {
+  line-height: 20px;
+  height: 20px;
+  font-size: 10pt;
+}
+.nav-bar .nav-bar-inner .element [class^="icon-"]:before,
+.nav-bar .nav-bar-inner a .element [class^="icon-"]:before,
+.nav-bar .nav-bar-inner .element [class*=" icon-"]:before,
+.nav-bar .nav-bar-inner a .element [class*=" icon-"]:before {
+  display: inline-block;
+  margin: 0;
+  padding: 0;
+  display: block;
+  float: left;
+  margin: 0 5px;
+}
 .nav-bar .nav-bar-inner  > ul.menu {
   margin-left: 0;
   list-style: none;
@@ -3862,7 +3884,6 @@ table.bordered tbody tr:last-child td {
   float: left;
   display: inline-block;
   padding: 0;
-  margin-right: 10px;
   font-weight: normal;
   font-size: 10pt;
   color: #fff;
@@ -3874,6 +3895,27 @@ table.bordered tbody tr:last-child td {
 .nav-bar .nav-bar-inner  > ul.menu > li.divider.brand {
   font-size: 1.15em;
 }
+.nav-bar .nav-bar-inner  > .divider img,
+.nav-bar .nav-bar-inner  > ul.menu > li.divider img {
+  height: 100%;
+}
+.nav-bar .nav-bar-inner  > .divider a,
+.nav-bar .nav-bar-inner  > ul.menu > li.divider a {
+  line-height: 20px;
+  height: 20px;
+  font-size: 10pt;
+}
+.nav-bar .nav-bar-inner  > .divider [class^="icon-"]:before,
+.nav-bar .nav-bar-inner  > ul.menu > li.divider [class^="icon-"]:before,
+.nav-bar .nav-bar-inner  > .divider [class*=" icon-"]:before,
+.nav-bar .nav-bar-inner  > ul.menu > li.divider [class*=" icon-"]:before {
+  display: inline-block;
+  margin: 0;
+  padding: 0;
+  display: block;
+  float: left;
+  margin: 0 5px;
+}
 .nav-bar .nav-bar-inner [data-role=dropdown] {
   margin-right: 20px !important;
 }