From 9daf1661c5c9cce161e1981b484b7d7f04eac2e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:54:59 -0800 Subject: fix docs for fluid layout, update topbar to fix active text color for links --- bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 5eb8a4a7c..e55d6d544 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 01:50:02 PST 2012 + * Date: Sun Jan 8 01:54:42 PST 2012 */ html, body { margin: 0; @@ -1600,7 +1600,7 @@ i { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.navbar .brand:hover, .navbar ul .active > a { +.navbar .brand:hover, .navbar .nav .active > a { color: #ffffff; text-decoration: none; background-color: #333333; -- cgit v1.2.3 From 916761d56854ca4fcc8ea4afa68511fb26a93e4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:57:05 -0800 Subject: fix styles on right aligned blockquote to flip padding and border appropriately --- bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e55d6d544..550f7fdce 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 01:54:42 PST 2012 + * Date: Sun Jan 8 01:56:47 PST 2012 */ html, body { margin: 0; @@ -485,6 +485,10 @@ blockquote small:before { } blockquote.pull-right { float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid #eee; } blockquote.pull-right p, blockquote.pull-right small { text-align: right; -- cgit v1.2.3 From cf05dc86774ea05aa0f40aff771538e6e2f405d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 02:15:47 -0800 Subject: adjust navs for fine details on dropdowns in stacked nav and improved open state there --- bootstrap.css | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 550f7fdce..e60baa663 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 01:56:47 PST 2012 + * Date: Sun Jan 8 02:15:22 PST 2012 */ html, body { margin: 0; @@ -1925,7 +1925,7 @@ i { .pills.stacked > li:last-child > a { margin-bottom: 1px; } -.tabs .dropdown-menu, .pills .dropdown-menu { +.nav .dropdown-menu { top: 33px; border-width: 1px; } @@ -1934,19 +1934,26 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { +.nav .dropdown-toggle .caret { + border-top-color: #0088cc; margin-top: 6px; } -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { +.nav .dropdown-toggle:hover .caret { + border-top-color: #005580; +} +.nav .open .dropdown-toggle { background-color: #999; border-color: #999; } -.tabs .open .caret, .pills .open .caret { +.nav .open .caret, .nav .open a:hover .caret { border-top-color: #fff; filter: alpha(opacity=100); -moz-opacity: 1; opacity: 1; } +.tabs.stacked .open > a:hover { + border-color: #999; +} .tabbable { zoom: 1; } -- cgit v1.2.3 From 9e7acc637057292205906edc99fb23a49c937afa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 02:30:18 -0800 Subject: fix responsive navbar nav treatment by using hover instead of click --- bootstrap.css | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index e60baa663..57acf8775 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 02:15:22 PST 2012 + * Date: Sun Jan 8 02:30:05 PST 2012 */ html, body { margin: 0; @@ -3054,7 +3054,7 @@ a.thumbnail:hover { width: auto; margin: 0; } - .nav { + .navbar .nav { position: absolute; top: 0; left: 0; @@ -3062,29 +3062,32 @@ a.thumbnail:hover { padding-top: 40px; list-style: none; } - .nav, .nav > li:last-child a { + .navbar .nav, .navbar .nav > li:last-child a { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } - .nav > li { + .navbar .nav > li { float: none; display: none; } - .nav > li > a { + .navbar .nav > li > a { float: none; background-color: #222; } - .nav > .active { + .navbar .nav > .active { display: block; position: absolute; top: 0; left: 0; } - .navbar ul .active > a { + .navbar .nav > .active > a { background-color: transparent; } - .nav > .active a:after { + .navbar .nav > .active > a:hover { + background-color: #333; + } + .navbar .nav > .active > a:after { display: inline-block; width: 0; height: 0; @@ -3100,8 +3103,11 @@ a.thumbnail:hover { opacity: 1; content: "↓"; } - .nav > .active a:hover { - background-color: rgba(255, 255, 255, 0.05); + .navbar .nav:hover > li { + display: block; + } + .navbar .nav:hover > li > a:hover { + background-color: #333; } } @media (min-width: 768px) and (max-width: 940px) { -- cgit v1.2.3 From b7acbd8476060bc1f2da9837693b0b86b68423c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 03:00:06 -0800 Subject: move collapsing navbar nav to 480 and below, unfloat nav for 768 and below to wrap links with position absolute --- bootstrap.css | 102 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 48 deletions(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 57acf8775..a9a104ccc 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 02:30:05 PST 2012 + * Date: Sun Jan 8 02:58:37 PST 2012 */ html, body { margin: 0; @@ -3007,53 +3007,6 @@ a.thumbnail:hover { visibility: hidden; } @media (max-width: 480px) { - .modal { - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .horizontal-form .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .horizontal-form .controls { - margin-left: 0; - } - .horizontal-form .control-list { - padding-top: 0; - } - .horizontal-form .form-actions { - padding-left: 0; - } - .modal { - position: fixed; - top: 20px; - left: 20px; - right: 20px; - width: auto; - } - .modal .close { - padding: 10px; - } -} -@media (max-width: 768px) { - .container { - width: auto; - padding: 0 20px; - } - .row { - margin-left: 0; - } - .row > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } .navbar .nav { position: absolute; top: 0; @@ -3109,6 +3062,59 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } + .modal { + width: auto; + margin: 0; + } + .modal.fade.in { + top: auto; + } + .horizontal-form .control-group > label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .horizontal-form .controls { + margin-left: 0; + } + .horizontal-form .control-list { + padding-top: 0; + } + .horizontal-form .form-actions { + padding-left: 0; + } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } +} +@media (max-width: 768px) { + .navbar-fixed { + position: absolute; + } + .navbar-fixed .nav { + float: none; + } + .container { + width: auto; + padding: 0 20px; + } + .row { + margin-left: 0; + } + .row > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } } @media (min-width: 768px) and (max-width: 940px) { .container { -- cgit v1.2.3