From 7fcfe61f4da41356b2ae974ad20536db0d74e83f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 7 Jan 2014 01:05:24 +0100 Subject: Update copyright notices in all places - Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo - grunt dist to update all the files --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7fd5a832a..e5f9efaa1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,6 +1,6 @@ /*! * Bootstrap v3.0.3 (http://getbootstrap.com) - * Copyright 2014 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From 8fd177bfa78d3e742486a66450465f3716cd11b2 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 7 Jan 2014 22:24:45 +0100 Subject: Fix #12073: Consistent order of variations This changes the order of component variations throughout the repo (code and docs) to be more consistent. The order now used everywhere is the one most frequently found in the repo before: Default, Primary, Success, Info, Warning, Danger --- dist/css/bootstrap.css | 294 ++++++++++++++++++++++++------------------------- 1 file changed, 147 insertions(+), 147 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e5f9efaa1..591372dc7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -491,18 +491,6 @@ cite { .text-primary:hover { color: #3071a9; } -.text-warning { - color: #8a6d3b; -} -.text-warning:hover { - color: #66512c; -} -.text-danger { - color: #a94442; -} -.text-danger:hover { - color: #843534; -} .text-success { color: #3c763d; } @@ -515,6 +503,18 @@ cite { .text-info:hover { color: #245269; } +.text-warning { + color: #8a6d3b; +} +.text-warning:hover { + color: #66512c; +} +.text-danger { + color: #a94442; +} +.text-danger:hover { + color: #843534; +} .bg-primary { color: #fff; background-color: #428bca; @@ -522,18 +522,6 @@ cite { a.bg-primary:hover { background-color: #3071a9; } -.bg-warning { - background-color: #fcf8e3; -} -a.bg-warning:hover { - background-color: #f7ecb5; -} -.bg-danger { - background-color: #f2dede; -} -a.bg-danger:hover { - background-color: #e4b9b9; -} .bg-success { background-color: #dff0d8; } @@ -546,6 +534,18 @@ a.bg-success:hover { a.bg-info:hover { background-color: #afd9ee; } +.bg-warning { + background-color: #fcf8e3; +} +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; +} .page-header { padding-bottom: 9px; margin: 40px 0 20px; @@ -1508,6 +1508,26 @@ table th[class*="col-"] { .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6; } +.table > thead > tr > td.info, +.table > tbody > tr > td.info, +.table > tfoot > tr > td.info, +.table > thead > tr > th.info, +.table > tbody > tr > th.info, +.table > tfoot > tr > th.info, +.table > thead > tr.info > td, +.table > tbody > tr.info > td, +.table > tfoot > tr.info > td, +.table > thead > tr.info > th, +.table > tbody > tr.info > th, +.table > tfoot > tr.info > th { + background-color: #d9edf7; +} +.table-hover > tbody > tr > td.info:hover, +.table-hover > tbody > tr > th.info:hover, +.table-hover > tbody > tr.info:hover > td, +.table-hover > tbody > tr.info:hover > th { + background-color: #c4e3f3; +} .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, @@ -1548,26 +1568,6 @@ table th[class*="col-"] { .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc; } -.table > thead > tr > td.info, -.table > tbody > tr > td.info, -.table > tfoot > tr > td.info, -.table > thead > tr > th.info, -.table > tbody > tr > th.info, -.table > tfoot > tr > th.info, -.table > thead > tr.info > td, -.table > tbody > tr.info > td, -.table > tfoot > tr.info > td, -.table > thead > tr.info > th, -.table > tbody > tr.info > th, -.table > tfoot > tr.info > th { - background-color: #d9edf7; -} -.table-hover > tbody > tr > td.info:hover, -.table-hover > tbody > tr > th.info:hover, -.table-hover > tbody > tr.info:hover > td, -.table-hover > tbody > tr.info:hover > th { - background-color: #c4e3f3; -} @media (max-width: 767px) { .table-responsive { width: 100%; @@ -1826,6 +1826,32 @@ textarea.input-lg { line-height: 34px; text-align: center; } +.has-success .help-block, +.has-success .control-label, +.has-success .radio, +.has-success .checkbox, +.has-success .radio-inline, +.has-success .checkbox-inline { + color: #3c763d; +} +.has-success .form-control { + border-color: #3c763d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); +} +.has-success .form-control:focus { + border-color: #2b542c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; +} +.has-success .input-group-addon { + color: #3c763d; + background-color: #dff0d8; + border-color: #3c763d; +} +.has-success .form-control-feedback { + color: #3c763d; +} .has-warning .help-block, .has-warning .control-label, .has-warning .radio, @@ -1878,32 +1904,6 @@ textarea.input-lg { .has-error .form-control-feedback { color: #a94442; } -.has-success .help-block, -.has-success .control-label, -.has-success .radio, -.has-success .checkbox, -.has-success .radio-inline, -.has-success .checkbox-inline { - color: #3c763d; -} -.has-success .form-control { - border-color: #3c763d; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -} -.has-success .form-control:focus { - border-color: #2b542c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; -} -.has-success .input-group-addon { - color: #3c763d; - background-color: #dff0d8; - border-color: #3c763d; -} -.has-success .form-control-feedback { - color: #3c763d; -} .form-control-static { margin-bottom: 0; } @@ -2144,6 +2144,47 @@ fieldset[disabled] .btn-success.active { color: #5cb85c; background-color: #fff; } +.btn-info { + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info:hover, +.btn-info:focus, +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + color: #fff; + background-color: #39b3d7; + border-color: #269abc; +} +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + background-image: none; +} +.btn-info.disabled, +.btn-info[disabled], +fieldset[disabled] .btn-info, +.btn-info.disabled:hover, +.btn-info[disabled]:hover, +fieldset[disabled] .btn-info:hover, +.btn-info.disabled:focus, +.btn-info[disabled]:focus, +fieldset[disabled] .btn-info:focus, +.btn-info.disabled:active, +.btn-info[disabled]:active, +fieldset[disabled] .btn-info:active, +.btn-info.disabled.active, +.btn-info[disabled].active, +fieldset[disabled] .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info .badge { + color: #5bc0de; + background-color: #fff; +} .btn-warning { color: #fff; background-color: #f0ad4e; @@ -2226,47 +2267,6 @@ fieldset[disabled] .btn-danger.active { color: #d9534f; background-color: #fff; } -.btn-info { - color: #fff; - background-color: #5bc0de; - border-color: #46b8da; -} -.btn-info:hover, -.btn-info:focus, -.btn-info:active, -.btn-info.active, -.open .dropdown-toggle.btn-info { - color: #fff; - background-color: #39b3d7; - border-color: #269abc; -} -.btn-info:active, -.btn-info.active, -.open .dropdown-toggle.btn-info { - background-image: none; -} -.btn-info.disabled, -.btn-info[disabled], -fieldset[disabled] .btn-info, -.btn-info.disabled:hover, -.btn-info[disabled]:hover, -fieldset[disabled] .btn-info:hover, -.btn-info.disabled:focus, -.btn-info[disabled]:focus, -fieldset[disabled] .btn-info:focus, -.btn-info.disabled:active, -.btn-info[disabled]:active, -fieldset[disabled] .btn-info:active, -.btn-info.disabled.active, -.btn-info[disabled].active, -fieldset[disabled] .btn-info.active { - background-color: #5bc0de; - border-color: #46b8da; -} -.btn-info .badge { - color: #5bc0de; - background-color: #fff; -} .btn-link { font-weight: normal; color: #428bca; @@ -4669,6 +4669,28 @@ a.list-group-item-success.active:focus { background-color: #3c763d; border-color: #3c763d; } +.list-group-item-info { + color: #31708f; + background-color: #d9edf7; +} +a.list-group-item-info { + color: #31708f; +} +a.list-group-item-info .list-group-item-heading { + color: inherit; +} +a.list-group-item-info:hover, +a.list-group-item-info:focus { + color: #31708f; + background-color: #c4e3f3; +} +a.list-group-item-info.active, +a.list-group-item-info.active:hover, +a.list-group-item-info.active:focus { + color: #fff; + background-color: #31708f; + border-color: #31708f; +} .list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3; @@ -4713,28 +4735,6 @@ a.list-group-item-danger.active:focus { background-color: #a94442; border-color: #a94442; } -.list-group-item-info { - color: #31708f; - background-color: #d9edf7; -} -a.list-group-item-info { - color: #31708f; -} -a.list-group-item-info .list-group-item-heading { - color: inherit; -} -a.list-group-item-info:hover, -a.list-group-item-info:focus { - color: #31708f; - background-color: #c4e3f3; -} -a.list-group-item-info.active, -a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus { - color: #fff; - background-color: #31708f; - border-color: #31708f; -} .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -4939,6 +4939,20 @@ a.list-group-item-info.active:focus { .panel-success > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #d6e9c6; } +.panel-info { + border-color: #bce8f1; +} +.panel-info > .panel-heading { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} +.panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} .panel-warning { border-color: #faebcc; } @@ -4967,20 +4981,6 @@ a.list-group-item-info.active:focus { .panel-danger > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #ebccd1; } -.panel-info { - border-color: #bce8f1; -} -.panel-info > .panel-heading { - color: #31708f; - background-color: #d9edf7; - border-color: #bce8f1; -} -.panel-info > .panel-heading + .panel-collapse .panel-body { - border-top-color: #bce8f1; -} -.panel-info > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #bce8f1; -} .well { min-height: 20px; padding: 19px; -- cgit v1.2.3 From fc62379e61aa953d67b1bcf07c2f87d663ba77bc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 9 Jan 2014 11:11:13 -0800 Subject: grunt dist --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 591372dc7..3ccabd364 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2357,7 +2357,7 @@ input[type="button"].btn-block { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; -- cgit v1.2.3 From 7f153974e10980dccbdd485e63941b591e925148 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 9 Jan 2014 18:07:14 -0800 Subject: Fixes #11990 and #12159: Make range inputs block level and 100% wide by default --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 3ccabd364..9d9292f71 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1651,6 +1651,10 @@ input[type="checkbox"] { input[type="file"] { display: block; } +input[type="range"] { + display: block; + width: 100%; +} select[multiple], select[size] { height: auto; -- cgit v1.2.3