navbar.less in bootstrap_farsi-3.3.6

- old
+ new

@@ -90,11 +90,11 @@
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   .navbar-collapse {
     max-height: @navbar-collapse-max-height;
 
-    @media (max-width: @screen-xs-min) and (orientation: landscape) {
+    @media (max-device-width: @screen-xs-min) and (orientation: landscape) {
       max-height: 200px;
     }
   }
 }
 
@@ -139,11 +139,10 @@
 .navbar-fixed-bottom {
   position: fixed;
   .right(0);
   .left(0);
   z-index: @zindex-navbar-fixed;
-  .translate3d(0, 0, 0);
 
   // Undo the rounded corners
   @media (min-width: @grid-float-breakpoint) {
     border-radius: 0;
   }
@@ -171,10 +170,14 @@
   &:hover,
   &:focus {
     text-decoration: none;
   }
 
+  > img {
+    display: block;
+  }
+
   @media (min-width: @grid-float-breakpoint) {
     .navbar > .container &,
     .navbar > .container-fluid & {
       .margin-left(-@navbar-padding-horizontal);
     }
@@ -269,30 +272,14 @@
       > a {
         padding-top:    @navbar-padding-vertical;
         padding-bottom: @navbar-padding-vertical;
       }
     }
-
-    &.navbar-right:last-child {
-      .margin-right(-@navbar-padding-horizontal);
-    }
   }
 }
 
 
-// Component alignment
-//
-// Repurpose the pull utilities as their own navbar utilities to avoid specificity
-// issues with parents and chaining. Only do this when the navbar is uncollapsed
-// though so that navbar contents properly stack and align in mobile.
-
-@media (min-width: @grid-float-breakpoint) {
-  .navbar-left  { .pull-left(); }
-  .navbar-right { .pull-right(); }
-}
-
-
 // Navbar form
 //
 // Extension of the `.form-inline` with some extra flavor for optimum display in
 // our navbars.
 
@@ -309,10 +296,14 @@
   .form-inline();
 
   .form-group {
     @media (max-width: @grid-float-breakpoint-max) {
       margin-bottom: 5px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
   }
 
   // Vertically center in expanded, horizontal navbar
   .navbar-vertical-align(@input-height-base);
@@ -324,15 +315,10 @@
     .margin-left(0);
     .margin-right(0);
     padding-top: 0;
     padding-bottom: 0;
     .box-shadow(none);
-
-    // Outdent the form if last child to line up with content down the page
-    &.navbar-right:last-child {
-      .margin-right(-@navbar-padding-horizontal);
-    }
   }
 }
 
 
 // Dropdown menus
@@ -342,10 +328,12 @@
   margin-top: 0;
   .border-top-radius(0);
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  margin-bottom: 0;
+  .border-top-radius(@navbar-border-radius);
   .border-bottom-radius(0);
 }
 
 
 // Buttons in navbars
@@ -373,16 +361,33 @@
 
   @media (min-width: @grid-float-breakpoint) {
     .float(left);
     .margin-left(@navbar-padding-horizontal);
     .margin-right(@navbar-padding-horizontal);
+  }
+}
 
-    // Outdent the form if last child to line up with content down the page
-    &.navbar-right:last-child {
+
+// Component alignment
+//
+// Repurpose the pull utilities as their own navbar utilities to avoid specificity
+// issues with parents and chaining. Only do this when the navbar is uncollapsed
+// though so that navbar contents properly stack and align in mobile.
+//
+// Declared after the navbar components to ensure more specificity on the margins.
+
+@media (min-width: @grid-float-breakpoint) {
+  .navbar-left  { .pull-left(); }
+  .navbar-right {
+    .pull-right();
+    .margin-right(-@navbar-padding-horizontal);
+
+    ~ .navbar-right {
       .margin-right(0);
     }
   }
 }
+
 
 // Alternate navbars
 // --------------------------------------------------
 
 // Default navbar