From 7cfcfdfe64159b4ea7b94606f9303ab567049198 Mon Sep 17 00:00:00 2001 From: liuyl Date: Tue, 30 Jul 2013 09:30:21 +0800 Subject: make navbar-text float left --- dist/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6afdbde29..6817bcc82 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2974,6 +2974,8 @@ button.close { } .navbar-text { + float: left; + padding: 0 15px; margin-top: 15px; margin-bottom: 15px; } -- cgit v1.2.3 From 56aedcb71397c867396455b6860d627c1efe2707 Mon Sep 17 00:00:00 2001 From: liuyl Date: Thu, 1 Aug 2013 11:26:12 +0800 Subject: add table-layout --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e0862209e..f11f26248 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3158,6 +3158,7 @@ button.close { .btn-group-justified { display: table; width: 100%; + table-layout: fixed; } .btn-group-justified .btn { -- cgit v1.2.3 From 6b850132d056a136dc4734c4d68c9e1c23b7843e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 17:57:19 -0700 Subject: Remove requirement of `.list-group-flush` when list groups are in panels Fixes #8900 --- dist/css/bootstrap.css | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 183ffb983..a0a8ffaea 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2386,6 +2386,23 @@ a.list-group-item.active .list-group-item-text { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } +.panel .list-group { + margin: 15px -15px -15px; +} + +.panel .list-group .list-group-item { + border-width: 1px 0; +} + +.panel .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.panel .list-group .list-group-item:last-child { + border-bottom: 0; +} + .panel-heading { padding: 10px 15px; margin: -15px -15px 15px; @@ -2461,23 +2478,6 @@ a.list-group-item.active .list-group-item-text { border-color: #bce8f1; } -.list-group-flush { - margin: 15px -15px -15px; -} - -.list-group-flush .list-group-item { - border-width: 1px 0; -} - -.list-group-flush .list-group-item:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.list-group-flush .list-group-item:last-child { - border-bottom: 0; -} - .well { min-height: 20px; padding: 19px; -- cgit v1.2.3 From 9435991ff0ffa79c027f12c0a08aa13376c3b2fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 18:48:44 -0700 Subject: move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b) --- dist/css/bootstrap.css | 112 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a0a8ffaea..8aaf8d451 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1647,6 +1647,62 @@ textarea.input-small { color: #737373; } +.form-inline .form-control, +.form-inline .radio, +.form-inline .checkbox { + display: inline-block; +} + +.form-inline .radio, +.form-inline .checkbox { + margin-top: 0; + margin-bottom: 0; +} + +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + padding-top: 9px; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +@media (min-width: 768px) { + .form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; + } +} + +.form-horizontal .form-group .row { + margin-right: -15px; + margin-left: -15px; +} + +@media (min-width: 768px) { + .form-horizontal .control-label { + text-align: right; + } +} + .btn { display: inline-block; padding: 6px 12px; @@ -2106,62 +2162,6 @@ input[type="button"].btn-block { z-index: 2; } -.form-inline .form-control, -.form-inline .radio, -.form-inline .checkbox { - display: inline-block; -} - -.form-inline .radio, -.form-inline .checkbox { - margin-top: 0; - margin-bottom: 0; -} - -.form-horizontal .control-label, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: 9px; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -@media (min-width: 768px) { - .form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; - } -} - -.form-horizontal .form-group .row { - margin-right: -15px; - margin-left: -15px; -} - -@media (min-width: 768px) { - .form-horizontal .control-label { - text-align: right; - } -} - .caret { display: inline-block; width: 0; -- cgit v1.2.3 From 4bbbf774a4b36ce5f36e4a35a2e7bed807dd640b Mon Sep 17 00:00:00 2001 From: liuyl Date: Sun, 4 Aug 2013 09:27:23 +0800 Subject: add line-height --- dist/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 219940b2a..d5167e7d9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2104,12 +2104,14 @@ input[type="button"].btn-block { .input-group-addon.input-small { padding: 5px 10px; font-size: 12px; + line-height: 1.5; border-radius: 3px; } .input-group-addon.input-large { padding: 10px 16px; font-size: 18px; + line-height: 1.33; border-radius: 6px; } @@ -3318,7 +3320,7 @@ button.close { .pagination > li > a, .pagination > li > span { float: left; - padding: 4px 12px; + padding: 6px 12px; line-height: 1.428571429; text-decoration: none; background-color: #ffffff; -- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- dist/css/bootstrap.css | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d5167e7d9..4259d4d2b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1537,7 +1537,7 @@ textarea.form-control { margin-left: 10px; } -.input-large { +.input-lg { height: 45px; padding: 10px 16px; font-size: 18px; @@ -1545,7 +1545,7 @@ textarea.form-control { border-radius: 6px; } -.input-small { +.input-sm { height: 30px; padding: 5px 10px; font-size: 12px; @@ -1553,18 +1553,18 @@ textarea.form-control { border-radius: 3px; } -select.input-large { +select.input-lg { height: 45px; line-height: 45px; } -select.input-small { +select.input-sm { height: 30px; line-height: 30px; } -textarea.input-large, -textarea.input-small { +textarea.input-lg, +textarea.input-sm { height: auto; } @@ -1989,22 +1989,22 @@ fieldset[disabled] .btn-link:focus { text-decoration: none; } -.btn-large { +.btn-lg { padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -.btn-small, -.btn-mini { +.btn-sm, +.btn-xs { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.btn-mini { +.btn-xs { padding: 3px 5px; } @@ -2101,14 +2101,14 @@ input[type="button"].btn-block { box-sizing: border-box; } -.input-group-addon.input-small { +.input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.input-group-addon.input-large { +.input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2496,12 +2496,12 @@ a.list-group-item.active .list-group-item-text { border-color: rgba(0, 0, 0, 0.15); } -.well-large { +.well-lg { padding: 24px; border-radius: 6px; } -.well-small { +.well-sm { padding: 9px; border-radius: 3px; } @@ -3220,7 +3220,7 @@ button.close { padding-left: 8px; } -.btn-group > .btn-large + .dropdown-toggle { +.btn-group > .btn-lg + .dropdown-toggle { padding-right: 12px; padding-left: 12px; } @@ -3234,11 +3234,11 @@ button.close { margin-left: 0; } -.btn-large .caret { +.btn-lg .caret { border-width: 5px; } -.dropup .btn-large .caret { +.dropup .btn-lg .caret { border-bottom-width: 5px; } @@ -3363,38 +3363,38 @@ button.close { background-color: #ffffff; } -.pagination-large > li > a, -.pagination-large > li > span { +.pagination-lg > li > a, +.pagination-lg > li > span { padding: 10px 16px; font-size: 18px; } -.pagination-large > li:first-child > a, -.pagination-large > li:first-child > span { +.pagination-lg > li:first-child > a, +.pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px; } -.pagination-large > li:last-child > a, -.pagination-large > li:last-child > span { +.pagination-lg > li:last-child > a, +.pagination-lg > li:last-child > span { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -.pagination-small > li > a, -.pagination-small > li > span { +.pagination-sm > li > a, +.pagination-sm > li > span { padding: 5px 10px; font-size: 12px; } -.pagination-small > li:first-child > a, -.pagination-small > li:first-child > span { +.pagination-sm > li:first-child > a, +.pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px; } -.pagination-small > li:last-child > a, -.pagination-small > li:last-child > span { +.pagination-sm > li:last-child > a, +.pagination-sm > li:last-child > span { border-top-right-radius: 3px; border-bottom-right-radius: 3px; } -- cgit v1.2.3