vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss in bootstrap-sass-rails-2.0.0.3 vs vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss in bootstrap-sass-rails-2.0.1.0

- old
+ new

@@ -1,7 +1,7 @@ /*! - * Bootstrap Responsive v2.0.0 + * Bootstrap Responsive v2.0.1 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * @@ -54,11 +54,11 @@ select[class*="span"], textarea[class*="span"], .uneditable-input { display: block; width: 100%; - height: 28px; /* Make inputs at least the height of their button counterpart */ + min-height: 28px; /* Make inputs at least the height of their button counterpart */ /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ @@ -121,11 +121,11 @@ // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- -@media (max-width: 768px) { +@media (max-width: 767px) { // GRID & CONTAINERS // ----------------- // Remove width from containers .container { width: auto; @@ -152,11 +152,11 @@ // PORTRAIT TABLET TO DEFAULT DESKTOP // ---------------------------------- -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { // Fixed grid @include gridSystem-generate(12, 42px, 20px); // Fluid grid @@ -169,11 +169,11 @@ // TABLETS AND BELOW // ----------------- -@media (max-width: 980px) { +@media (max-width: 979px) { // UNFIX THE TOPBAR // ---------------- // Remove any padding from the body body { @@ -212,9 +212,13 @@ .navbar .nav > li > a { margin-bottom: 2px; } .navbar .nav > .divider-vertical { display: none; + } + .navbar .nav .nav-header { + color: @navbarText; + text-shadow: none; } // Nav and dropdown links in navbar .navbar .nav > li > a, .navbar .dropdown-menu a { padding: 6px 15px;