From 0da3901ed5a6d498af8b7c76b61d004a003f716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 8 Nov 2013 10:30:15 +0100 Subject: Add missing `.small` styles and docs --- dist/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6aef1f6fd..6d9bead8d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -692,13 +692,15 @@ blockquote p:last-child { margin-bottom: 0; } -blockquote small { +blockquote small, +blockquote .small { display: block; line-height: 1.428571429; color: #999999; } -blockquote small:before { +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } -- cgit v1.2.3 From c2a6e950d75ece24aa856b0cd7b0f50223c9a7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 13 Nov 2013 22:32:46 +0100 Subject: Remove unusual keyframes prefixes --- dist/css/bootstrap.css | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6aef1f6fd..64740d9df 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5396,24 +5396,6 @@ a.thumbnail.active { } } -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - @keyframes progress-bar-stripes { from { background-position: 40px 0; -- cgit v1.2.3 From a2c6daafd05a54d1c944a9d6f2dc076914121117 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Nov 2013 17:48:31 -0800 Subject: fixes #10744: back to solid borders on carets --- dist/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 64740d9df..657ba69da 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3462,7 +3462,6 @@ input[type="button"].btn-block { vertical-align: middle; border-top: 4px solid #000000; border-right: 4px solid transparent; - border-bottom: 0 dotted; border-left: 4px solid transparent; } @@ -3580,7 +3579,7 @@ input[type="button"].btn-block { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0 dotted; + border-top: 0; border-bottom: 4px solid #000000; content: ""; } -- cgit v1.2.3 From ae4d5f21a96fab3691ca33e9e3747a01c467e10e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Nov 2013 18:01:59 -0800 Subject: fixes #11449: use menlo over monaco --- 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 657ba69da..68e8b8c75 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -740,7 +740,7 @@ code, kbd, pre, samp { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; } code { -- cgit v1.2.3 From 8aec527614608085d6cf92480abf843fbf720fdf Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 17 Nov 2013 23:45:42 +0100 Subject: Run 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 68e8b8c75..d8dfe14c4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4665,13 +4665,13 @@ textarea.input-group-sm > .input-group-btn > .btn { } .navbar-text { - float: left; margin-top: 15px; margin-bottom: 15px; } @media (min-width: 768px) { .navbar-text { + float: left; margin-right: 15px; margin-left: 15px; } -- cgit v1.2.3 From bff8ba2b794305842d7a712a1bf6e400b898b7c0 Mon Sep 17 00:00:00 2001 From: Jesse Mandel Date: Mon, 25 Nov 2013 15:19:11 -0800 Subject: Fix for Issue #11411 --- dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d8dfe14c4..7b4443405 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1953,6 +1953,7 @@ output { .form-control::-moz-placeholder { color: #999999; + opacity: 1; } .form-control:-ms-input-placeholder { @@ -5655,7 +5656,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel > .table, -.panel > .table-responsive { +.panel > .table-responsive > .table { margin-bottom: 0; } -- cgit v1.2.3 From 9829c86f7ca5c76ef21892ec1198858eebc99392 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Nov 2013 15:21:27 -0800 Subject: run grunt --- 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 d8dfe14c4..c5a55a37f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1953,6 +1953,7 @@ output { .form-control::-moz-placeholder { color: #999999; + opacity: 1; } .form-control:-ms-input-placeholder { -- cgit v1.2.3 From 3d5e598e5c9bc4d0573266e9a0aa84f988683285 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 18:40:15 +0100 Subject: add builded files from dist/ --- dist/css/bootstrap.css | 127 ++++--------------------------------------------- 1 file changed, 10 insertions(+), 117 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c5a55a37f..b11416e1f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,11 +1,11 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * Copyright 2013 Twitter, Inc. + * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ article, @@ -3461,7 +3461,7 @@ input[type="button"].btn-block { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid #000000; + border-top: 4px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; } @@ -3581,7 +3581,7 @@ input[type="button"].btn-block { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid #000000; + border-bottom: 4px solid; content: ""; } @@ -3599,30 +3599,6 @@ input[type="button"].btn-block { } } -.btn-default .caret { - border-top-color: #333333; -} - -.btn-primary .caret, -.btn-success .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret { - border-top-color: #fff; -} - -.dropup .btn-default .caret { - border-bottom-color: #333333; -} - -.dropup .btn-primary .caret, -.dropup .btn-success .caret, -.dropup .btn-warning .caret, -.dropup .btn-danger .caret, -.dropup .btn-info .caret { - border-bottom-color: #fff; -} - .btn-group, .btn-group-vertical { position: relative; @@ -4102,13 +4078,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #428bca; } -.nav .open > a .caret, -.nav .open > a:hover .caret, -.nav .open > a:focus .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav .nav-divider { height: 1px; margin: 9px 0; @@ -4221,13 +4190,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #428bca; } -.nav-pills > li.active > a .caret, -.nav-pills > li.active > a:hover .caret, -.nav-pills > li.active > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - .nav-stacked > li { float: none; } @@ -4300,16 +4262,6 @@ textarea.input-group-sm > .input-group-btn > .btn { display: block; } -.nav .caret { - border-top-color: #428bca; - border-bottom-color: #428bca; -} - -.nav a:hover .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; @@ -4739,12 +4691,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #e7e7e7; } -.navbar-default .navbar-nav > .dropdown > a:hover .caret, -.navbar-default .navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { @@ -4752,18 +4698,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #e7e7e7; } -.navbar-default .navbar-nav > .open > a .caret, -.navbar-default .navbar-nav > .open > a:hover .caret, -.navbar-default .navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar-default .navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777777; @@ -4863,23 +4797,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #080808; } -.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-nav > .dropdown > a .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .navbar-nav > .open > a .caret, -.navbar-inverse .navbar-nav > .open > a:hover .caret, -.navbar-inverse .navbar-nav > .open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; @@ -5784,10 +5701,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #dddddd; } -.panel-default > .panel-heading > .dropdown .caret { - border-color: #333333 transparent; -} - .panel-default > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #dddddd; } @@ -5806,10 +5719,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #428bca; } -.panel-primary > .panel-heading > .dropdown .caret { - border-color: #ffffff transparent; -} - .panel-primary > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #428bca; } @@ -5828,10 +5737,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #d6e9c6; } -.panel-success > .panel-heading > .dropdown .caret { - border-color: #468847 transparent; -} - .panel-success > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #d6e9c6; } @@ -5850,10 +5755,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #faebcc; } -.panel-warning > .panel-heading > .dropdown .caret { - border-color: #c09853 transparent; -} - .panel-warning > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #faebcc; } @@ -5872,10 +5773,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #ebccd1; } -.panel-danger > .panel-heading > .dropdown .caret { - border-color: #b94a48 transparent; -} - .panel-danger > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #ebccd1; } @@ -5894,10 +5791,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #bce8f1; } -.panel-info > .panel-heading > .dropdown .caret { - border-color: #3a87ad transparent; -} - .panel-info > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #bce8f1; } -- cgit v1.2.3 From 594d0c700dacbce8805bab1be6111631c8e003fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 11:33:00 -0800 Subject: grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing --- dist/css/bootstrap.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b11416e1f..60e2330c5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,11 +1,11 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * Copyright 2013 Twitter, Inc. + * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ article, -- cgit v1.2.3 From 9d485db721ba248224696eb63eafdfabad1fcbe2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:34:42 -0800 Subject: run grunt after last merge --- dist/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 75d27fde8..832a0e85f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -333,7 +333,7 @@ a:focus { } a:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1902,7 +1902,7 @@ select optgroup { input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2257,7 +2257,7 @@ textarea.input-lg { } .btn:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -- cgit v1.2.3 From 9f68a5b241fff2adce3b95b5c5b486e84a1d88d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:39:39 -0800 Subject: Fixes #11516: Invert dropdown divider border in navbars --- dist/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 832a0e85f..30dfb4856 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4801,6 +4801,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; } + .navbar-inverse .navbar-nav .open .dropdown-menu .divider { + background-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } -- cgit v1.2.3 From c13524e7e0f3d2a62935bbe2cb57c1388e04e052 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:49:51 -0800 Subject: Fixes #11553: Prevent double border on tables in panels without thead content --- dist/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 30dfb4856..e5ce19d47 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5585,6 +5585,11 @@ a.list-group-item.active:focus .list-group-item-text { border-top: 1px solid #dddddd; } +.panel > .table > tbody:first-child th, +.panel > .table > tbody:first-child td { + border-top: 0; +} + .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0; -- cgit v1.2.3 From 9d939080e6536277ec47d19e113bff7376489ff9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 14:22:31 -0800 Subject: Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class --- dist/css/bootstrap.css | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e5ce19d47..9b94a0a30 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -807,6 +807,24 @@ pre code { clear: both; } +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + .row { margin-right: -15px; margin-left: -15px; @@ -1105,9 +1123,6 @@ pre code { } @media (min-width: 768px) { - .container { - width: 750px; - } .col-sm-1, .col-sm-2, .col-sm-3, @@ -1277,9 +1292,6 @@ pre code { } @media (min-width: 992px) { - .container { - width: 970px; - } .col-md-1, .col-md-2, .col-md-3, @@ -1449,9 +1461,6 @@ pre code { } @media (min-width: 1200px) { - .container { - width: 1170px; - } .col-lg-1, .col-lg-2, .col-lg-3, -- cgit v1.2.3 From d654f905028a40893fa553f529d12dceec879cf7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 15:37:11 -0800 Subject: Fixes #10147: Remove outline from carousel controls on focus --- 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 9b94a0a30..8e31b72da 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6363,6 +6363,7 @@ button.close { .carousel-control:focus { color: #ffffff; text-decoration: none; + outline: none; opacity: 0.9; filter: alpha(opacity=90); } -- cgit v1.2.3 From 09cd5289ab540486a9c601e79860b34a2fe1873c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 17:47:27 -0800 Subject: Fixes #11468: Prevent default gradient on in Firefox for Android --- 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 8aabfb85d..53dc6233a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4475,6 +4475,7 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-bottom: 8px; background-color: transparent; + background-image: none; border: 1px solid transparent; border-radius: 4px; } -- cgit v1.2.3 From a4c54b5e5d948e9ec7cdd22bc0efa2241d2605c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 18:33:59 -0800 Subject: Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar --- 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 53dc6233a..49d060008 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5179,6 +5179,10 @@ a.list-group-item.active > .badge, border-radius: 6px; } +.jumbotron .container { + max-width: 100%; +} + @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; -- cgit v1.2.3 From 36b82c37ecbedd13f9a2f3eca545745eb8eedf75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 21:59:28 -0800 Subject: Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies --- dist/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 49d060008..6d3a9e1e9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2070,7 +2070,7 @@ textarea.input-sm { } .input-lg { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2078,8 +2078,8 @@ textarea.input-sm { } select.input-lg { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-lg { @@ -3884,7 +3884,7 @@ input[type="button"].btn-block { .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -3894,8 +3894,8 @@ input[type="button"].btn-block { select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-group-lg > .form-control, -- cgit v1.2.3 From bf9f39270c7c6d50b0355a0b1a5e470c0820af07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 22:03:49 -0800 Subject: Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop --- dist/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6d3a9e1e9..7d9961d3c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5909,7 +5909,7 @@ button.close { position: relative; z-index: 1050; width: auto; - padding: 10px; + margin: 10px; margin-right: auto; margin-left: auto; } @@ -6009,8 +6009,8 @@ button.close { @media screen and (min-width: 768px) { .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin-top: 30px; + margin-bottom: 30px; } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); -- cgit v1.2.3 From e4848286c86af39c5a30c845748fdc46de8b8dd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 23:19:04 -0800 Subject: Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles --- dist/css/bootstrap.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7d9961d3c..afd259372 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5198,10 +5198,7 @@ a.list-group-item.active > .badge, } .thumbnail { - display: inline-block; display: block; - height: auto; - max-width: 100%; padding: 4px; margin-bottom: 20px; line-height: 1.428571429; -- cgit v1.2.3 From 9f0da54856f6a4111b4d9f8780db2b2257ef90b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 23:29:34 -0800 Subject: grunt to get dist files --- dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 64740d9df..9aa88986f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3789,7 +3789,8 @@ input[type="button"].btn-block { } .btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; -- cgit v1.2.3