From 918a17a30bbaed3f7d8c80a30b7766b95e636dff Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Mon, 30 Jan 2012 00:50:47 +0200 Subject: Adding dropup support to split buttons and navbar * Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups) * Extends the .bottom-up class to carets and all relevant caret styles * Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups * Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs --- docs/assets/css/bootstrap.css | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c96818a56..e2b419af7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1517,6 +1517,11 @@ table .span12 { filter: alpha(opacity=30); content: "\2193"; } +.caret.bottom-up { + border-top: 0; + border-bottom: 4px solid #000000; + content: "\2191"; +} .dropdown .caret { margin-top: 8px; margin-left: 2px; @@ -1558,7 +1563,11 @@ table .span12 { .dropdown-menu.bottom-up { top: auto; bottom: 100%; - margin-bottom: 2px; + margin-bottom: 1px; +} +.dropdown-menu.pull-right { + right: 0; + left: auto; } .dropdown-menu .divider { height: 1px; @@ -1992,6 +2001,7 @@ button.btn.small, input[type="submit"].btn.small { .info .caret, .success .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 0.75; filter: alpha(opacity=75); } @@ -2217,6 +2227,7 @@ button.btn.small, input[type="submit"].btn.small { } .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } @@ -2554,8 +2565,22 @@ button.btn.small, input[type="submit"].btn.small { top: -6px; left: 10px; } +.navbar .dropdown-menu.bottom-up:before { + border-top: 7px solid #ccc; + border-top-color: rgba(0, 0, 0, 0.2); + border-bottom: 0; + bottom: -7px; + top: auto; +} +.navbar .dropdown-menu.bottom-up:after { + border-top: 6px solid #ffffff; + border-bottom: 0; + bottom: -6px; + top: auto; +} .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar .nav .active .caret { opacity: 1; @@ -2567,15 +2592,15 @@ button.btn.small, input[type="submit"].btn.small { .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu { +.navbar .nav.pull-right .dropdown-menu, .navbar .nav .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .nav.pull-right .dropdown-menu:before { +.navbar .nav.pull-right .dropdown-menu:before, .navbar .nav .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .nav.pull-right .dropdown-menu:after { +.navbar .nav.pull-right .dropdown-menu:after, .navbar .nav .dropdown-menu.pull-right:after { left: auto; right: 13px; } -- cgit v1.2.3 From 97b3057824272080166e592016131db53e55c427 Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Mon, 30 Jan 2012 01:13:21 +0200 Subject: Extending the dropup support to tabs and pills This was needed to match the color of the carets that are used for tabs and pills --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e2b419af7..9cd0ec5f1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2208,13 +2208,16 @@ button.btn.small, input[type="submit"].btn.small { } .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { border-top-color: #0088cc; + border-bottom-color: #0088cc; margin-top: 6px; } .tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; + border-bottom-color: #005580; } .tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { border-top-color: #333333; + border-bottom-color: #333333; } .nav > .dropdown.active > a:hover { color: #000000; -- cgit v1.2.3 From b4cc6c74f59442879ba2b1ed3e86d26e62390835 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 21:12:16 -0800 Subject: add support and docs for .navbar-fixed-bottom --- docs/assets/css/bootstrap.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e9fb04f2d..b90cb7635 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2840,20 +2840,26 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-fixed-top { +.navbar-fixed-top, .navbar-fixed-bottom { position: fixed; - top: 0; right: 0; left: 0; z-index: 1030; + margin-bottom: 0; } -.navbar-fixed-top .navbar-inner { +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.navbar-fixed-top { + top: 0; +} +.navbar-fixed-bottom { + bottom: 0; +} .navbar .nav { position: relative; left: 0; -- cgit v1.2.3 From 8bd67bb124ccc87ecfe7959f3e75bb497d7991e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 22:09:51 -0800 Subject: clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c9c2ee891..912be887a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1867,12 +1867,12 @@ table .span24 { left: auto; right: 0; } -.dropup .caret { +.dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; } -.dropup .dropdown-menu { +.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 1px; @@ -2945,14 +2945,14 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { top: -6px; left: 10px; } -.navbar .dropdown-menu.bottom-up:before { +.navbar-fixed-bottom .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar .dropdown-menu.bottom-up:after { +.navbar-fixed-bottom .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; -- cgit v1.2.3 From 9b524a16e9cb5d8c9e0a6c4c7b83a3a881e415ee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 23:00:02 -0800 Subject: clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 --- docs/assets/css/bootstrap.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 912be887a..45ae99964 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1228,20 +1228,19 @@ table { } .table-bordered { border: 1px solid #ddd; + border-left: 0; border-collapse: separate; *border-collapse: collapsed; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { +.table-bordered th, .table-bordered td { border-left: 1px solid #ddd; } .table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top: 0; + border-bottom: 1px solid #ddd; } .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -- cgit v1.2.3 From a139167489e249345933b1e58cc7c53542abab97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 23:15:43 -0800 Subject: set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) --- docs/assets/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 45ae99964..7a91fa5bd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -134,7 +134,7 @@ a:hover { float: left; margin-left: 20px; } -.container { +.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; } .span1 { @@ -2698,6 +2698,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { -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 .container { + width: auto; +} .btn-navbar { display: none; float: right; -- cgit v1.2.3