From 2df0a0fdeb2ceec2cb193dee98d97cfb9c5e1b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Tue, 14 Aug 2012 13:58:12 +0200 Subject: now with 13 custom jquery plugins --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6abfad081..3fd9070be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1042,6 +1042,7 @@ input[type="file"] { select { width: 220px; + background-color: #ffffff; border: 1px solid #bbb; } -- cgit v1.2.3 From 2a6deb92b1786d572ed23347e486043e0df63547 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:29:31 -0700 Subject: fixes #4395: scope dropdown menu caret in navbar to first level dropdown only --- 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 3fd9070be..c7fbc3e96 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4285,7 +4285,7 @@ input[type="submit"].btn.btn-mini { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { position: absolute; top: -7px; left: 9px; @@ -4297,7 +4297,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { position: absolute; top: -6px; left: 10px; @@ -4308,7 +4308,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { top: auto; bottom: -7px; border-top: 7px solid #ccc; @@ -4316,7 +4316,7 @@ input[type="submit"].btn.btn-mini { border-top-color: rgba(0, 0, 0, 0.2); } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { top: auto; bottom: -6px; border-top: 6px solid #ffffff; -- cgit v1.2.3 From 0b0d7f104c08307e0a6f275ccaa60db580d6f728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:32:03 -0700 Subject: fixes #4396: pull right dropdown menus no longer overlaid by submenus --- docs/assets/css/bootstrap.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c7fbc3e96..ec63378c5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4360,6 +4360,17 @@ input[type="submit"].btn.btn-mini { left: auto; } +.navbar .pull-right .dropdown-menu .dropdown-menu, +.navbar .dropdown-menu.pull-right .dropdown-menu { + right: 100%; + left: auto; + margin-right: -1px; + margin-left: 0; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + .navbar-inverse { color: #999999; } -- cgit v1.2.3 From dbcd87331d8a84fe5f65da0420409e859effebf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:51:33 -0700 Subject: fixes #4371: scope hovers on table rows to tbody --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec63378c5..d6cfbe099 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1863,8 +1863,8 @@ table { background-color: #f9f9f9; } -.table-hover tr:hover td, -.table-hover tr:hover th { +.table-hover tbody tr:hover td, +.table-hover tbody tr:hover th { background-color: #f5f5f5; } -- cgit v1.2.3 From 50df524ba1b504e069e69e6f317184357f397cd0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:53:45 -0700 Subject: remove borders entirely from fixed navbars --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6cfbe099..fb69a19ba 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4146,6 +4146,11 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner { + border: 0; +} + .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-right: 0; @@ -4165,7 +4170,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner { - border-width: 0 0 1px; -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); @@ -4176,7 +4180,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -- cgit v1.2.3 From 5144c77b272e12a48913faa0b7d1e54eccd2e638 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:57:49 -0700 Subject: fixes #4358: make select elements 30px tall to match inputs --- docs/assets/css/bootstrap.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fb69a19ba..f22d2824d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,6 +943,7 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; + vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1031,13 +1032,13 @@ input[type="checkbox"] { select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; + line-height: 30px; } select { -- cgit v1.2.3 From a80dafbb18bc689abcfe45cd4aec570e7790b171 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:00:22 -0700 Subject: fix width of star github btn in docs --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f22d2824d..5dee1cf35 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,7 +943,6 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; - vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -- cgit v1.2.3 From 780636d955d5c121133de526ba72c1874f7c0337 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:29:47 -0700 Subject: fixes #3674: checkbox vertical alignment in IE9 --- docs/assets/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5dee1cf35..7dd417c68 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1013,9 +1013,8 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { margin: 4px 0; + margin-top: 1px \9; *margin-top: 0; - /* IE7 */ - line-height: normal; cursor: pointer; } -- cgit v1.2.3 From f933a41c7bb71e58a4c151389748b92c8a204a27 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:34:10 -0700 Subject: remove bottom margin on radios and checkboxes --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7dd417c68..8e7abe9f3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1012,7 +1012,7 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { - margin: 4px 0; + margin: 4px 0 0; margin-top: 1px \9; *margin-top: 0; line-height: normal; -- cgit v1.2.3 From f3479a39537b7b10bf66846c11d500f3364af88a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:44:25 -0700 Subject: compensate for ie7 button padding with no borders, fix indentation --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8e7abe9f3..a70f305a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3253,8 +3253,8 @@ button.close { button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, -- cgit v1.2.3 From 9c72246d491fa942635a27ee0047e473f4df05cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:24:58 -0700 Subject: navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 --- docs/assets/css/bootstrap.css | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a70f305a3..3c4ce62d1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -150,7 +150,7 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -340,7 +340,7 @@ a:hover { display: block; float: left; width: 100%; - min-height: 28px; + min-height: 30px; margin-left: 2.127659574468085%; *margin-left: 2.074468085106383%; -webkit-box-sizing: border-box; @@ -2865,6 +2865,7 @@ table .span24 { position: relative; height: 0; overflow: hidden; + overflow: visible \9; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -o-transition: height 0.35s ease; @@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { right: 0; left: auto; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { right: 12px; left: auto; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { right: 13px; left: auto; } -.navbar .pull-right .dropdown-menu .dropdown-menu, -.navbar .dropdown-menu.pull-right .dropdown-menu { +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { right: 100%; left: auto; margin-right: -1px; -- cgit v1.2.3 From 2ee035403d2dd9c19b7bfd3f90a83422a4ab7d7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:28:17 -0700 Subject: running make on prev merge --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3c4ce62d1..7d706b036 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4030,7 +4030,7 @@ input[type="submit"].btn.btn-mini { .navbar .brand { display: block; float: left; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; -- cgit v1.2.3