diff options
| author | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
| commit | 03e6dc66c2fe14e756723395752feefb687b6526 (patch) | |
| tree | b8cfe13d72e1a780ef08dbd26e3bfe48e406c59e /less/responsive.less | |
| parent | 9143d8e449a852c606194ea8c529e30ea1a52ddf (diff) | |
| parent | 091622644a0c619e1afbb21041c141da30df76b7 (diff) | |
| download | bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.tar.xz bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.zip | |
Merge branch '2.0.1-wip'
Diffstat (limited to 'less/responsive.less')
| -rw-r--r-- | less/responsive.less | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/less/responsive.less b/less/responsive.less index 7d494a357..5b85776e9 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -56,7 +56,7 @@ .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 */ @@ -123,7 +123,7 @@ // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- -@media (max-width: 768px) { +@media (max-width: 767px) { // GRID & CONTAINERS // ----------------- // Remove width from containers @@ -154,7 +154,7 @@ // PORTRAIT TABLET TO DEFAULT DESKTOP // ---------------------------------- -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { // Fixed grid #gridSystem > .generate(12, 42px, 20px); @@ -171,7 +171,7 @@ // TABLETS AND BELOW // ----------------- -@media (max-width: 980px) { +@media (max-width: 979px) { // UNFIX THE TOPBAR // ---------------- @@ -215,6 +215,10 @@ .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 { |