From f0f33eb9a3a25ae2f0032f630ff84c58cb0ca431 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Mar 2013 15:42:11 -0700 Subject: Refactor .list-inline and .list-unstyled * Instead of shared and separate CSS, isolate by class for easier mixin-ability * .list-unstyled is now used as a mixin in .list-inline --- docs/assets/css/bootstrap.css | 6 +++++- 1 file changed, 5 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 5632d3aad..50d207001 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -546,7 +546,11 @@ li { line-height: 20px; } -.list-unstyled, +.list-unstyled { + margin-left: 0; + list-style: none; +} + .list-inline { margin-left: 0; list-style: none; -- cgit v1.2.3 From fe414d8566f647e65dc20bc7505630ce798e5445 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Mar 2013 23:33:45 -0700 Subject: turn docs navbar into left navbar --- docs/assets/css/bootstrap.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 50d207001..ac0ea34e5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3255,6 +3255,7 @@ button.close { } .navbar-fixed-top, +.navbar-fixed-left, .navbar-fixed-bottom { position: fixed; right: 0; @@ -3271,6 +3272,16 @@ button.close { bottom: 0; } +.navbar-fixed-left { + top: 0; + right: auto; + bottom: 0; +} + +.navbar-fixed-left .container { + max-width: none; +} + .navbar-brand { display: block; max-width: 200px; @@ -3496,6 +3507,15 @@ button.close { .navbar-inverse .nav > .divider { border-right-color: #2f2f2f; } + .navbar-fixed-left { + padding-right: 0; + padding-left: 0; + } + .navbar-fixed-left .navbar-brand, + .navbar-fixed-left .nav, + .navbar-fixed-left .nav > li { + float: none; + } .navbar-toggle { position: relative; top: auto; -- cgit v1.2.3 From 090545ffdf8b8f750afb0601a16a7bbac07ff6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Thu, 28 Mar 2013 11:33:18 +0100 Subject: Make sure form actions are properly aligned with form-horizontal --- 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 50d207001..d096c6c50 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1705,6 +1705,9 @@ select:focus:invalid:focus { .form-horizontal .control-group > .controls { margin-left: 180px; } + .form-horizontal .form-actions { + padding-left: 180px; + } } .btn { -- cgit v1.2.3 From 88141252595b3875ac001741aa77c7905aac942c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Mar 2013 23:33:08 -0700 Subject: Add subnav support to CSS section --- docs/assets/css/bootstrap.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b68972dd2..0afdb0ab8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3258,7 +3258,6 @@ button.close { } .navbar-fixed-top, -.navbar-fixed-left, .navbar-fixed-bottom { position: fixed; right: 0; @@ -3275,16 +3274,6 @@ button.close { bottom: 0; } -.navbar-fixed-left { - top: 0; - right: auto; - bottom: 0; -} - -.navbar-fixed-left .container { - max-width: none; -} - .navbar-brand { display: block; max-width: 200px; -- cgit v1.2.3 From aee25786a73820b6c502ba099c55fb4008b4bd1e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:23:18 -0700 Subject: fuck everything about .clear_float() -- restore .clearfix() as mixin --- docs/assets/css/bootstrap.css | 123 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 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 0afdb0ab8..4f034974a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -365,12 +365,12 @@ cite { font-style: normal; } -.muted { +.text-muted { color: #999999; } -a.muted:hover, -a.muted:focus { +a.text-muted:hover, +a.text-muted:focus { color: #808080; } @@ -589,6 +589,16 @@ dd { clear: both; } +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: " "; +} + +.dl-horizontal:after { + clear: both; +} + .dl-horizontal dt { float: left; width: 160px; @@ -746,6 +756,16 @@ pre code { clear: both; } +.container:before, +.container:after { + display: table; + content: " "; +} + +.container:after { + clear: both; +} + .row { margin-right: -15px; margin-left: -15px; @@ -761,6 +781,16 @@ pre code { clear: both; } +.row:before, +.row:after { + display: table; + content: " "; +} + +.row:after { + clear: both; +} + [class*="col-span-"] { position: relative; min-height: 1px; @@ -1498,6 +1528,16 @@ select:focus:invalid:focus { clear: both; } +.form-actions:before, +.form-actions:after { + display: table; + content: " "; +} + +.form-actions:after { + clear: both; +} + .help-block, .help-inline { color: #737373; @@ -1691,6 +1731,14 @@ select:focus:invalid:focus { .form-horizontal .control-group:after { clear: both; } + .form-horizontal .control-group:before, + .form-horizontal .control-group:after { + display: table; + content: " "; + } + .form-horizontal .control-group:after { + clear: both; + } .form-horizontal .control-group input, .form-horizontal .control-group select, .form-horizontal .control-group textarea { @@ -2763,7 +2811,6 @@ fieldset[disabled] .btn-link:focus { font-weight: normal; line-height: 20px; color: #333333; - white-space: nowrap; } .dropdown-menu > li > a:hover, @@ -2968,6 +3015,16 @@ button.close { clear: both; } +.nav:before, +.nav:after { + display: table; + content: " "; +} + +.nav:after { + clear: both; +} + .nav > li { display: block; } @@ -3126,6 +3183,16 @@ button.close { clear: both; } +.tabbable:before, +.tabbable:after { + display: table; + content: " "; +} + +.tabbable:after { + clear: both; +} + .tab-content > .tab-pane, .pill-content > .pill-pane { display: none; @@ -3222,6 +3289,16 @@ button.close { clear: both; } +.navbar:before, +.navbar:after { + display: table; + content: " "; +} + +.navbar:after { + clear: both; +} + .navbar .nav { margin-top: 15px; } @@ -3483,6 +3560,14 @@ button.close { .navbar .nav:after { clear: both; } + .navbar .nav:before, + .navbar .nav:after { + display: table; + content: " "; + } + .navbar .nav:after { + clear: both; + } .navbar .nav.pull-right { float: right; } @@ -3615,6 +3700,16 @@ button.close { clear: both; } +.btn-toolbar:before, +.btn-toolbar:after { + display: table; + content: " "; +} + +.btn-toolbar:after { + clear: both; +} + .btn-toolbar .btn-group { float: left; } @@ -3880,6 +3975,16 @@ button.close { clear: both; } +.pager:before, +.pager:after { + display: table; + content: " "; +} + +.pager:after { + clear: both; +} + .pager li { display: inline; } @@ -4027,6 +4132,16 @@ button.close { clear: both; } +.modal-footer:before, +.modal-footer:after { + display: table; + content: " "; +} + +.modal-footer:after { + clear: both; +} + .modal-footer .btn + .btn { margin-bottom: 0; margin-left: 5px; -- cgit v1.2.3 From 9fff2d3fb6a636c7ee61ad097c5b247e8def3ab5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 14:15:18 -0700 Subject: Change error to danger for all classes; add panels component --- docs/assets/css/bootstrap.css | 80 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 9 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4f034974a..b86a16a78 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -383,12 +383,12 @@ a.text-warning:focus { color: #a47e3c; } -.text-error { +.text-danger { color: #b94a48; } -a.text-error:hover, -a.text-error:focus { +a.text-danger:hover, +a.text-danger:focus { color: #953b39; } @@ -1119,9 +1119,9 @@ table th[class*="col-span-"] { border-color: #d6e9c6; } -.table > tbody > tr > td.error, -.table > tbody > tr > th.error, -.table > tbody > tr.error > td { +.table > tbody > tr > td.danger, +.table > tbody > tr > th.danger, +.table > tbody > tr.danger > td { background-color: #f2dede; border-color: #eed3d7; } @@ -1140,9 +1140,9 @@ table th[class*="col-span-"] { border-color: #c9e2b3; } -.table-hover > tbody > tr > td.error:hover, -.table-hover > tbody > tr > th.error:hover, -.table-hover > tbody > tr.error:hover > td { +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td { background-color: #ebcccc; border-color: #e6c1c7; } @@ -2944,6 +2944,68 @@ fieldset[disabled] .btn-link:focus { z-index: 1051; } +.panel { + padding: 15px; + margin-bottom: 20px; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); +} + +.panel-heading { + padding: 10px 15px; + margin: -15px -15px 15px; + font-size: 16px; + font-size: 1.6rem; + font-weight: 500; + background-color: #f5f5f5; + border-bottom: 1px solid #dddddd; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +.panel-success { + border-color: #d6e9c6; +} + +.panel-success .panel-heading { + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; +} + +.panel-warning { + border-color: #fbeed5; +} + +.panel-warning .panel-heading { + color: #c09853; + background-color: #fcf8e3; + border-color: #fbeed5; +} + +.panel-danger { + border-color: #eed3d7; +} + +.panel-danger .panel-heading { + color: #b94a48; + background-color: #f2dede; + border-color: #eed3d7; +} + +.panel-info { + border-color: #bce8f1; +} + +.panel-info .panel-heading { + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; +} + .well { min-height: 20px; padding: 19px; -- cgit v1.2.3 From 2a9604fdd297fee6661561d1ccf7922b4d599641 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:07:50 -0700 Subject: add list group component --- docs/assets/css/bootstrap.css | 91 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b86a16a78..fcbc5d580 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2944,6 +2944,80 @@ fieldset[disabled] .btn-link:focus { z-index: 1051; } +.list-group { + margin: 0 0 20px; + background-color: #ffffff; +} + +.list-group-item { + position: relative; + display: block; + padding: 10px 30px 10px 15px; + margin-bottom: -1px; + border: 1px solid #dddddd; +} + +.list-group-item:first-child { + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} + +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} + +.list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} + +.list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} + +a.list-group-item .list-group-item-heading { + color: #333; +} + +a.list-group-item .list-group-item-text { + color: #555; +} + +a.list-group-item:hover, +a.list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} + +a.list-group-item.active { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} + +a.list-group-item.active .list-group-item-heading, +a.list-group-item.active .list-group-item-text { + color: inherit; +} + +.list-group-item > .badge, +.list-group-item > .glyphicon-chevron-right { + float: right; + margin-right: -15px; +} + +.list-group-item > .glyphicon-chevron-right { + margin-right: -15px; +} + +.list-group-item > .glyphicon + .badge { + margin-right: 5px; +} + .panel { padding: 15px; margin-bottom: 20px; @@ -3006,6 +3080,23 @@ fieldset[disabled] .btn-link:focus { 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 1683669eaa75555e1454105460ed6b7bcaca9f11 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:56:49 -0700 Subject: Remove .nav-list given new .list-group --- docs/assets/css/bootstrap.css | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fcbc5d580..8e5a3dbc5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3267,30 +3267,6 @@ button.close { text-align: center; } -.nav-list > li > a { - margin-bottom: -1px; - border: 1px solid #e5e5e5; -} - -.nav-list > li:first-child > a { - border-top-right-radius: 4px; - border-top-left-radius: 4px; -} - -.nav-list > li:last-child > a { - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover, -.nav-list > .active > a:focus { - z-index: 2; - color: #fff; - background-color: #428bca; - border-color: #428bca; -} - .nav > .disabled > a { color: #999999; } @@ -4803,7 +4779,7 @@ a.badge:focus { top: 0; } -.nav-list > .active > a > .badge, +a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; background-color: #fff; -- cgit v1.2.3 From 6edd5f291aba8f66816fe2ca1dfb61daeaab0efe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 17:00:11 -0700 Subject: not quite #fff on .list-group-item-text --- 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 8e5a3dbc5..dadd15845 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2999,11 +2999,14 @@ a.list-group-item.active { border-color: #428bca; } -a.list-group-item.active .list-group-item-heading, -a.list-group-item.active .list-group-item-text { +a.list-group-item.active .list-group-item-heading { color: inherit; } +a.list-group-item.active .list-group-item-text { + color: #e1edf7; +} + .list-group-item > .badge, .list-group-item > .glyphicon-chevron-right { float: right; -- cgit v1.2.3 From fc16e37aaa2764bfc9ae131d6f69bd59d8ac5858 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 11:26:13 -0700 Subject: Remove the handful of rem font-sizes --- docs/assets/css/bootstrap.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dadd15845..fb44326f7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -290,7 +290,6 @@ html { body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; - font-size: 1.4rem; line-height: 20px; color: #333333; background-color: #ffffff; @@ -343,10 +342,9 @@ p { .lead { margin-bottom: 20px; - font-size: 21px; - font-size: 2.1rem; + font-size: 21; font-weight: 200; - line-height: 1.3; + line-height: 1.4; } small { @@ -3034,8 +3032,7 @@ a.list-group-item.active .list-group-item-text { .panel-heading { padding: 10px 15px; margin: -15px -15px 15px; - font-size: 16px; - font-size: 1.6rem; + font-size: 17.5; font-weight: 500; background-color: #f5f5f5; border-bottom: 1px solid #dddddd; -- cgit v1.2.3 From a2145df7c42bfc503437c51c7975727a829a7fae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 11:58:25 -0700 Subject: run make after that breadcrumbs tweak --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fb44326f7..52bd999ae 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3982,6 +3982,10 @@ button.close { content: "\00a0 /"; } +.breadcrumb > li:last-child:after { + content: ""; +} + .breadcrumb > .active { color: #999999; } -- cgit v1.2.3 From 674768b1775a135a4ed66f299795d8221dc89982 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 12:00:04 -0700 Subject: restore px unit on @font-size-base --- docs/assets/css/bootstrap.css | 58 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 52bd999ae..e93ff3853 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -342,7 +342,7 @@ p { .lead { margin-bottom: 20px; - font-size: 21; + font-size: 21px; font-weight: 200; line-height: 1.4; } @@ -467,58 +467,58 @@ h6 { h1, .h1 { - font-size: 38.5; + font-size: 38.5px; font-size: 4rem; } h2, .h2 { - font-size: 31.5; + font-size: 31.5px; font-size: 3rem; } h3, .h3 { - font-size: 24.5; + font-size: 24.5px; font-size: 2.5rem; } h4, .h4 { - font-size: 17.5; + font-size: 17.5px; font-size: 2rem; } h5, .h5 { - font-size: 14; + font-size: 14px; font-size: 1.6rem; } h6, .h6 { - font-size: 11.9; + font-size: 11.9px; font-size: 1.2rem; } h1 small, .h1 small { - font-size: 24.5; + font-size: 24.5px; } h2 small, .h2 small { - font-size: 17.5; + font-size: 17.5px; } h3 small, .h3 small { - font-size: 14; + font-size: 14px; } h4 small, .h4 small { - font-size: 14; + font-size: 14px; } .page-header { @@ -638,7 +638,7 @@ blockquote { blockquote p { margin-bottom: 0; - font-size: 17.5; + font-size: 17.5px; font-weight: 300; line-height: 1.25; } @@ -692,7 +692,7 @@ code, pre { padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12; + font-size: 12px; color: #333333; border-radius: 4px; } @@ -709,7 +709,7 @@ pre { display: block; padding: 9.5px; margin: 0 0 10px; - font-size: 13; + font-size: 13px; line-height: 20px; word-break: break-all; word-wrap: break-word; @@ -1167,7 +1167,7 @@ legend { width: 100%; padding: 0; margin-bottom: 20px; - font-size: 21; + font-size: 21px; line-height: 40px; color: #333333; border: 0; @@ -1199,7 +1199,7 @@ input[type="color"] { display: inline-block; min-height: 34px; padding: 6px 9px; - font-size: 14; + font-size: 14px; line-height: 20px; color: #555555; vertical-align: middle; @@ -1375,7 +1375,7 @@ input[type="search"].input-large, input[type="tel"].input-large, input[type="color"].input-large { padding: 11px 14px; - font-size: 17.5; + font-size: 17.5px; border-radius: 6px; } @@ -1397,7 +1397,7 @@ input[type="tel"].input-small, input[type="color"].input-small { min-height: 26px; padding: 2px 10px; - font-size: 11.9; + font-size: 11.9px; border-radius: 3px; } @@ -1594,7 +1594,7 @@ select:focus:invalid:focus { .input-group-addon { padding: 6px 8px; - font-size: 14; + font-size: 14px; font-weight: normal; line-height: 20px; text-align: center; @@ -1608,12 +1608,12 @@ select:focus:invalid:focus { .input-group-addon.input-small { padding: 2px 10px; - font-size: 11.9; + font-size: 11.9px; } .input-group-addon.input-large { padding: 11px 14px; - font-size: 17.5; + font-size: 17.5px; } .input-group input:first-child, @@ -1760,7 +1760,7 @@ select:focus:invalid:focus { display: inline-block; padding: 6px 12px; margin-bottom: 0; - font-size: 14; + font-size: 14px; font-weight: 500; line-height: 20px; text-align: center; @@ -1804,19 +1804,19 @@ fieldset[disabled] .btn { .btn-large { padding: 11px 14px; - font-size: 17.5; + font-size: 17.5px; border-radius: 6px; } .btn-small { padding: 2px 10px; - font-size: 11.9; + font-size: 11.9px; border-radius: 3px; } .btn-mini { padding: 0 6px; - font-size: 10.5; + font-size: 10.5px; border-radius: 3px; } @@ -3032,7 +3032,7 @@ a.list-group-item.active .list-group-item-text { .panel-heading { padding: 10px 15px; margin: -15px -15px 15px; - font-size: 17.5; + font-size: 17.5px; font-weight: 500; background-color: #f5f5f5; border-bottom: 1px solid #dddddd; @@ -4049,7 +4049,7 @@ button.close { .pagination-large > li > a, .pagination-large > li > span { padding: 11px 14px; - font-size: 17.5; + font-size: 17.5px; } .pagination-large > li:first-child > a, @@ -4083,13 +4083,13 @@ button.close { .pagination-small > li > a, .pagination-small > li > span { padding: 2px 10px; - font-size: 11.9; + font-size: 11.9px; } .pagination-mini > li > a, .pagination-mini > li > span { padding: 0 6px; - font-size: 10.5; + font-size: 10.5px; } .pager { -- cgit v1.2.3 From 388a4c878db2a41d15f438632463dafb65e6e748 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 13:20:54 -0700 Subject: remove lingering rem --- docs/assets/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e93ff3853..750a68a99 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -468,37 +468,31 @@ h6 { h1, .h1 { font-size: 38.5px; - font-size: 4rem; } h2, .h2 { font-size: 31.5px; - font-size: 3rem; } h3, .h3 { font-size: 24.5px; - font-size: 2.5rem; } h4, .h4 { font-size: 17.5px; - font-size: 2rem; } h5, .h5 { font-size: 14px; - font-size: 1.6rem; } h6, .h6 { font-size: 11.9px; - font-size: 1.2rem; } h1 small, -- cgit v1.2.3 From c5042e050e4f55f90ffa7ee28c84892e798f964f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 17:17:10 -0700 Subject: fix nav divider --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 750a68a99..b47250e82 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2789,7 +2789,7 @@ fieldset[disabled] .btn-link:focus { } .dropdown-menu .divider { - height: 1px; + height: 2px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5; @@ -3289,7 +3289,7 @@ button.close { } .nav .divider { - height: 1px; + height: 2px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5; @@ -3522,7 +3522,7 @@ button.close { } .navbar .nav > .divider { - height: 1px; + height: 2px; margin: 9px 0; overflow: hidden; background-color: #e1e1e1; -- cgit v1.2.3 From 6b23a66c29c3613c6792a257aafa949c81746597 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 17:19:12 -0700 Subject: -background to -bg on tooltip and popover vars --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 b47250e82..2c8dc619a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4399,9 +4399,9 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + background-clip: padding-box; + -webkit-bg-clip: padding-box; + -moz-bg-clip: padding; } .popover.top { -- cgit v1.2.3 From d5fa1d80bb040aac32caed8fa1c97eb1b3e1abfe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 17:22:12 -0700 Subject: use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg --- 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 2c8dc619a..27e532f58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4120,8 +4120,8 @@ button.close { .pager li > span { display: inline-block; padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: 15px; } -- cgit v1.2.3 From d6f37f3c568ed70a7e20fdaa5429501d5af406a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 17:27:22 -0700 Subject: @link-color-hover to @link-hover-color --- 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 27e532f58..4c3cc20ac 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3350,8 +3350,8 @@ button.close { margin-top: 8px; } .nav .dropdown-toggle:hover .caret { - border-top-color: @link-color-hover; - border-bottom-color: @link-color-hover; + border-top-color: @link-hover-color; + border-bottom-color: @link-hover-color; } // Active dropdown links -- cgit v1.2.3 From db284a97d6b0d6eb20c3b6724440cbd26b80ccbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 17:56:31 -0700 Subject: more consistent navbar vars --- 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 4c3cc20ac..06314aafa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3735,7 +3735,7 @@ button.close { .navbar-link { color: @navbar-link-color; &:hover { - color: @navbar-link-color-hover; + color: @navbar-link-hover-color; } } -- cgit v1.2.3 From 4c49458336f8bcc7ec7ebca5384e3430645e5fe8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 18:40:07 -0700 Subject: remove text-rendering optimizeLegibility from headings --- 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 06314aafa..f35962995 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -426,7 +426,6 @@ h6, font-family: inherit; font-weight: 500; line-height: 20px; - text-rendering: optimizelegibility; } h1 small, -- cgit v1.2.3 From c69310153e5eec18f67df1df60c38ed807a75637 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 19:26:40 -0700 Subject: Fixes #7438: remove max-height from justified nav tabs with some CSS wankery --- docs/assets/css/bootstrap.css | 18 +++++++++++++++++- 1 file changed, 17 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 f35962995..c59d1aae7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3250,7 +3250,7 @@ button.close { } .nav-justified { - max-height: 40px; + width: 100%; } .nav-justified > li { @@ -3260,6 +3260,22 @@ button.close { text-align: center; } +.nav-justified.nav-tabs { + border-bottom: 0; +} + +.nav-justified.nav-tabs > li > a { + border-bottom: 1px solid #ddd; +} + +.nav-justified.nav-tabs > .active > a { + border-bottom-color: #ffffff; +} + +.nav-justified > li > a { + margin-right: 0; +} + .nav > .disabled > a { color: #999999; } -- cgit v1.2.3 From 2f8deea95ac246455a11511963ded2b63e963922 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 22:22:52 -0700 Subject: add .panel-primary --- docs/assets/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c59d1aae7..76b5ec31d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3033,6 +3033,16 @@ a.list-group-item.active .list-group-item-text { border-top-left-radius: 3px; } +.panel-primary { + border-color: #428bca; +} + +.panel-primary .panel-heading { + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} + .panel-success { border-color: #d6e9c6; } -- cgit v1.2.3 From eac987c0d2bdb93ea4c916d52f38655bcc5e1255 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 12:55:48 -0700 Subject: only negative indent nested grid rows; add new grid example --- docs/assets/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 76b5ec31d..7f498b0c5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -757,11 +757,6 @@ pre code { clear: both; } -.row { - margin-right: -15px; - margin-left: -15px; -} - .row:before, .row:after { display: table; @@ -782,6 +777,11 @@ pre code { clear: both; } +.row .row { + margin-right: -15px; + margin-left: -15px; +} + [class*="col-span-"] { position: relative; min-height: 1px; -- cgit v1.2.3 From 7e31bea11410f9c1838aeabcb97ad802b69b658c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 13:25:51 -0700 Subject: run make --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7f498b0c5..1a7f3deec 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5147,6 +5147,10 @@ a.list-group-item.active > .badge, text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } +.carousel-caption .btn { + text-shadow: none; +} + @media screen and (min-width: 768px) { .carousel-control .glyphicon { width: 30px; -- cgit v1.2.3 From 0ac711059ba7aaa2996a529d7f9bf4110a6dd765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Apr 2013 16:17:04 -0700 Subject: refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first --- docs/assets/css/bootstrap.css | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1a7f3deec..44978573e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5137,13 +5137,14 @@ a.list-group-item.active > .badge, .carousel-caption { position: absolute; - right: 20%; + right: 15%; bottom: 20px; - left: 20%; - display: none; + left: 15%; + z-index: 10; padding-top: 20px; padding-bottom: 20px; color: #fff; + text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } @@ -5160,14 +5161,7 @@ a.list-group-item.active > .badge, font-size: 30px; } .carousel-caption { - right: 0; - left: 0; - z-index: 10; - display: block; - max-width: 60%; - padding: 30px; - margin-right: 0; - margin-left: 0; + padding-bottom: 30px; } } -- cgit v1.2.3 From eadfa59d92ad8bd898b2586056fbbf55906e1420 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Apr 2013 19:40:43 -0700 Subject: Add small grid for phones and tablets --- docs/assets/css/bootstrap.css | 57 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 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 44978573e..b4b499e8f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -782,13 +782,66 @@ pre code { margin-left: -15px; } -[class*="col-span-"] { +[class*="col-span-"], +[class*="col-small-"] { position: relative; min-height: 1px; padding-right: 15px; padding-left: 15px; } +[class*="col-small-"] { + float: left; +} + +.col-small-span-12 { + width: 100%; +} + +.col-small-span-11 { + width: 91.66666666666666%; +} + +.col-small-span-10 { + width: 83.33333333333334%; +} + +.col-small-span-9 { + width: 75%; +} + +.col-small-span-8 { + width: 66.66666666666666%; +} + +.col-small-span-7 { + width: 58.333333333333336%; +} + +.col-small-span-6 { + width: 50%; +} + +.col-small-span-5 { + width: 41.66666666666667%; +} + +.col-small-span-4 { + width: 33.33333333333333%; +} + +.col-small-span-3 { + width: 25%; +} + +.col-small-span-2 { + width: 16.666666666666664%; +} + +.col-small-span-1 { + width: 8.333333333333332%; +} + @media screen and (min-width: 768px) { .container { max-width: 728px; @@ -5161,6 +5214,8 @@ a.list-group-item.active > .badge, font-size: 30px; } .carousel-caption { + right: 20%; + left: 20%; padding-bottom: 30px; } } -- cgit v1.2.3 From 05710e10f7d4a823bb4854add74e974ced858e14 Mon Sep 17 00:00:00 2001 From: Garvin Date: Sat, 6 Apr 2013 21:48:53 -0400 Subject: Added min-height to modal-header for modals with no header text --- 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 b4b499e8f..2c7a106fc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4302,6 +4302,7 @@ button.close { } .modal-header { + min-height: 40px; padding: 9px 15px; border-bottom: 1px solid #e5e5e5; } -- cgit v1.2.3 From 24f8d9e1374d88f852402f71de0f728d1e8d62ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 9 Apr 2013 10:43:37 -0700 Subject: don't use table for label variatons --- 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 b4b499e8f..641de8a4a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4624,11 +4624,10 @@ button.close { color: #a47e3c; } -.close { +.alert .close { position: relative; top: -2px; right: -21px; - line-height: 20px; color: inherit; } -- cgit v1.2.3 From ae98f1803f09fae7e427075f99c19d218d68f46c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 12 Apr 2013 20:56:19 -0700 Subject: add modal variables and tweak padding for min-height on modal title --- 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 d550f0c83..374c1d132 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4302,18 +4302,18 @@ button.close { } .modal-header { - min-height: 40px; - padding: 9px 15px; + min-height: 35px; + padding: 15px; border-bottom: 1px solid #e5e5e5; } .modal-header .close { - margin-top: 2px; + margin-top: -2px; } .modal-title { margin: 0; - line-height: 30px; + line-height: 20px; } .modal-body { -- cgit v1.2.3 From bec5679264d92b94c44c7d9ebe92c9f735ac0d07 Mon Sep 17 00:00:00 2001 From: Paul Tyng Date: Sat, 13 Apr 2013 17:13:14 -0300 Subject: update docs bootstrap.css --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 374c1d132..2d2d624cd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1226,6 +1226,12 @@ label { font-weight: bold; } +input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + select, textarea, input[type="text"], -- cgit v1.2.3 From 86bb3b8126c94ee8c839eac4d9120f3edeafefdd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 13 Apr 2013 23:17:39 -0700 Subject: IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1) --- docs/assets/css/bootstrap.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2d2d624cd..9bc946e70 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -322,7 +322,6 @@ a:focus { } img { - width: auto\9; height: auto; max-width: 100%; vertical-align: middle; @@ -1226,12 +1225,6 @@ label { font-weight: bold; } -input[type="search"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - select, textarea, input[type="text"], @@ -1282,6 +1275,12 @@ input[type="checkbox"] { width: auto; } +input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + textarea { height: auto; } -- cgit v1.2.3 From f226463b057f945795661c3d19fbcabf63b931f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 13 Apr 2013 23:54:51 -0700 Subject: Restore on links in dropdowns as they are randomly breaking onto new lines --- 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 9bc946e70..74cb44246 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2860,6 +2860,7 @@ fieldset[disabled] .btn-link:focus { font-weight: normal; line-height: 20px; color: #333333; + white-space: nowrap; } .dropdown-menu > li > a:hover, -- cgit v1.2.3 From 5471ce8ea3471562cc56dd3e349982c54f6ed624 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 14 Apr 2013 20:33:10 -0700 Subject: Fixes #5256: Use > selector for better nesting of tables --- docs/assets/css/bootstrap.css | 90 +++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 42 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74cb44246..616661fa4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1026,15 +1026,17 @@ th { margin-bottom: 20px; } -.table th, -.table td { +.table thead > tr > th, +.table tbody > tr > th, +.table thead > tr > td, +.table tbody > tr > td { padding: 8px; line-height: 20px; vertical-align: top; border-top: 1px solid #dddddd; } -.table thead th { +.table thead > tr > th { vertical-align: bottom; } @@ -1055,8 +1057,10 @@ th { background-color: #ffffff; } -.table-condensed th, -.table-condensed td { +.table-condensed thead > tr > th, +.table-condensed tbody > tr > th, +.table-condensed thead > tr > td, +.table-condensed tbody > tr > td { padding: 4px 5px; } @@ -1067,70 +1071,72 @@ th { border-radius: 4px; } -.table-bordered th, -.table-bordered td { +.table-bordered thead > tr > th, +.table-bordered tbody > tr > th, +.table-bordered thead > tr > td, +.table-bordered tbody > tr > td { border-left: 1px solid #dddddd; } -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.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 { +.table-bordered caption + thead > tr:first-child th, +.table-bordered caption + tbody > tr:first-child th, +.table-bordered caption + tbody > tr:first-child td, +.table-bordered colgroup + thead > tr:first-child th, +.table-bordered colgroup + tbody > tr:first-child th, +.table-bordered colgroup + tbody > tr:first-child td, +.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; } -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child, -.table-bordered tbody:first-child tr:first-child > th:first-child { +.table-bordered thead:first-child > tr:first-child > th:first-child, +.table-bordered tbody:first-child > tr:first-child > td:first-child, +.table-bordered tbody:first-child > tr:first-child > th:first-child { border-top-left-radius: 4px; } -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child, -.table-bordered tbody:first-child tr:first-child > th:last-child { +.table-bordered thead:first-child > tr:first-child > th:last-child, +.table-bordered tbody:first-child > tr:first-child > td:last-child, +.table-bordered tbody:first-child > tr:first-child > th:last-child { border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tbody:last-child tr:last-child > th:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > th:first-child { +.table-bordered thead:last-child > tr:last-child > th:first-child, +.table-bordered tbody:last-child > tr:last-child > td:first-child, +.table-bordered tbody:last-child > tr:last-child > th:first-child, +.table-bordered tfoot:last-child > tr:last-child > td:first-child, +.table-bordered tfoot:last-child > tr:last-child > th:first-child { border-bottom-left-radius: 4px; } -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tbody:last-child tr:last-child > th:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > th:last-child { +.table-bordered thead:last-child > tr:last-child > th:last-child, +.table-bordered tbody:last-child > tr:last-child > td:last-child, +.table-bordered tbody:last-child > tr:last-child > th:last-child, +.table-bordered tfoot:last-child > tr:last-child > td:last-child, +.table-bordered tfoot:last-child > tr:last-child > th:last-child { border-bottom-right-radius: 4px; } -.table-bordered tfoot + tbody:last-child tr:last-child > td:first-child { +.table-bordered tfoot + tbody:last-child > tr:last-child > td:first-child { border-bottom-left-radius: 0; } -.table-bordered tfoot + tbody:last-child tr:last-child > td:last-child { +.table-bordered tfoot + tbody:last-child > tr:last-child > td:last-child { border-bottom-right-radius: 0; } -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { +.table-bordered caption + thead > tr:first-child > th:first-child, +.table-bordered caption + tbody > tr:first-child > td:first-child, +.table-bordered colgroup + thead > tr:first-child > th:first-child, +.table-bordered colgroup + tbody > tr:first-child > td:first-child { border-top-left-radius: 4px; } -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { +.table-bordered caption + thead > tr:first-child > th:last-child, +.table-bordered caption + tbody > tr:first-child > td:last-child, +.table-bordered colgroup + thead > tr:first-child > th:last-child, +.table-bordered colgroup + tbody > tr:first-child > td:last-child { border-top-right-radius: 4px; } -- cgit v1.2.3 From dc97a1967b81e994ebb31ed3cad89f58794b46b9 Mon Sep 17 00:00:00 2001 From: Artur Kwiatkowski Date: Tue, 16 Apr 2013 16:45:51 +0200 Subject: more nested navs --- docs/assets/css/bootstrap.css | 97 +++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 46 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 616661fa4..7ab329bbe 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3262,10 +3262,34 @@ button.close { background-color: #eeeeee; } +.nav > li.disabled > a { + color: #999999; +} + +.nav > li.disabled > a:hover, +.nav > li.disabled > a:focus { + color: #999999; + text-decoration: none; + cursor: default; + background-color: transparent; +} + +.nav > li + .nav-header { + margin-top: 9px; +} + .nav > .pull-right { float: right; } +.nav .divider { + height: 2px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; +} + .nav-tabs { border-bottom: 1px solid #ddd; } @@ -3286,9 +3310,9 @@ button.close { border-color: #eeeeee #eeeeee #dddddd; } -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover, -.nav-tabs > .active > a:focus { +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover, +.nav-tabs > li.active > a:focus { color: #555555; cursor: default; background-color: #ffffff; @@ -3296,6 +3320,27 @@ button.close { border-bottom-color: transparent; } +.nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} + +.nav-tabs.nav-justified > li { + display: table-cell; + float: none; + width: 1%; + text-align: center; +} + +.nav-tabs.nav-justified > li > a { + margin-right: 0; + border-bottom: 1px solid #ddd; +} + +.nav-tabs.nav-justified > .active > a { + border-bottom-color: #ffffff; +} + .nav-pills > li { float: left; } @@ -3308,9 +3353,9 @@ button.close { margin-left: 2px; } -.nav-pills > .active > a, -.nav-pills > .active > a:hover, -.nav-pills > .active > a:focus { +.nav-pills > li.active > a, +.nav-pills > li.active > a:hover, +.nav-pills > li.active > a:focus { color: #fff; background-color: #428bca; } @@ -3335,34 +3380,6 @@ button.close { text-align: center; } -.nav-justified.nav-tabs { - border-bottom: 0; -} - -.nav-justified.nav-tabs > li > a { - border-bottom: 1px solid #ddd; -} - -.nav-justified.nav-tabs > .active > a { - border-bottom-color: #ffffff; -} - -.nav-justified > li > a { - margin-right: 0; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover, -.nav > .disabled > a:focus { - color: #999999; - text-decoration: none; - cursor: default; - background-color: transparent; -} - .nav-header { display: block; padding: 3px 15px; @@ -3374,18 +3391,6 @@ button.close { text-transform: uppercase; } -.nav li + .nav-header { - margin-top: 9px; -} - -.nav .divider { - height: 2px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - .tabbable:before, .tabbable:after { display: table; -- cgit v1.2.3 From 4bd6abaff2ce71f78e6f8c9fc2e42d70122c6de2 Mon Sep 17 00:00:00 2001 From: Artur Kwiatkowski Date: Wed, 17 Apr 2013 19:47:23 +0200 Subject: applied @pagination-bg for .disabled state instead of hardcoded color in hex --- 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 7ab329bbe..bf2a529b4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4242,7 +4242,7 @@ button.close { .pager .disabled > span { color: #999999; cursor: default; - background-color: #fff; + background-color: #ffffff; } .modal-open { -- cgit v1.2.3 From d3e0d4a7baad213ccbfa8049d5f920ed1863b76b Mon Sep 17 00:00:00 2001 From: Jeremy Denoun Date: Thu, 18 Apr 2013 17:05:50 +0200 Subject: update docs --- 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 2f56af33f..145e08a5b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5813,6 +5813,9 @@ a.badge:focus { -moz-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + backface-visibility: hidden; } .progress .bar + .bar { -- cgit v1.2.3 From 7b5fcc2c9ae7631e114cec106c2f14c560617cbd Mon Sep 17 00:00:00 2001 From: Fabien Date: Fri, 19 Apr 2013 02:48:08 +0200 Subject: Remove dupe css rule of table element This are already declare in normalize --- docs/assets/css/bootstrap.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7ab329bbe..e6382cdee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1013,8 +1013,6 @@ pre code { table { max-width: 100%; background-color: transparent; - border-collapse: collapse; - border-spacing: 0; } th { -- cgit v1.2.3 From 39bb8146f863474eee6c7daa946ea07f6ce2aa04 Mon Sep 17 00:00:00 2001 From: Artur Kwiatkowski Date: Fri, 19 Apr 2013 21:31:55 +0200 Subject: more nested labels component --- 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 b9809980c..5e5c7d44d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4784,6 +4784,7 @@ a.thumbnail:focus { } .label { + display: inline; padding: .25em .6em; font-size: 75%; font-weight: 500; -- cgit v1.2.3 From afdab35aca4ccfbe9214c4cdf6f6b1d2da595cad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:09:08 -0700 Subject: Fixes #7640: only reset margin on last-child p within blockquotes --- docs/assets/css/bootstrap.css | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9809980c..1e86761f4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -623,18 +623,21 @@ abbr.initialism { } blockquote { - padding: 0 0 0 15px; + padding: 10px 20px; margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { - margin-bottom: 0; font-size: 17.5px; font-weight: 300; line-height: 1.25; } +blockquote p:last-child { + margin-bottom: 0; +} + blockquote small { display: block; line-height: 20px; @@ -2874,10 +2877,9 @@ fieldset[disabled] .btn-link:focus { color: #ffffff; text-decoration: none; background-color: #357ebd; - background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#428bca), to(#357ebd)); background-image: -webkit-linear-gradient(top, #428bca, #357ebd); - background-image: -o-linear-gradient(top, #428bca, #357ebd); + background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: linear-gradient(to bottom, #428bca, #357ebd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); @@ -2889,10 +2891,9 @@ fieldset[disabled] .btn-link:focus { color: #ffffff; text-decoration: none; background-color: #357ebd; - background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#428bca), to(#357ebd)); background-image: -webkit-linear-gradient(top, #428bca, #357ebd); - background-image: -o-linear-gradient(top, #428bca, #357ebd); + background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: linear-gradient(to bottom, #428bca, #357ebd); background-repeat: repeat-x; outline: 0; @@ -4957,7 +4958,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; @@ -4982,7 +4982,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -4995,7 +4994,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5008,7 +5006,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5021,7 +5018,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5133,10 +5129,9 @@ a.list-group-item.active > .badge, .carousel-control.left { background-color: rgba(0, 0, 0, 0.0001); background-color: transparent; - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); @@ -5147,10 +5142,9 @@ a.list-group-item.active > .badge, left: auto; background-color: rgba(0, 0, 0, 0.5); background-color: transparent; - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); -- cgit v1.2.3 From 510c9a6ad87a1148fe59a7b8531d9b9e11b0ae17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:33:09 -0700 Subject: First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic --- docs/assets/css/bootstrap.css | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1e86761f4..d24999c4a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5310,47 +5310,67 @@ a.list-group-item.active > .badge, } .visible-phone { - display: none !important; + display: inherit !important; } .visible-tablet { display: none !important; } -.hidden-desktop { +.visible-desktop { display: none !important; } -.visible-desktop { +.hidden-phone { + display: none !important; +} + +.hidden-tablet { + display: inherit !important; +} + +.hidden-desktop { display: inherit !important; } @media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { + .visible-phone { + display: none !important; + } + .visible-tablet { display: inherit !important; } .visible-desktop { - display: none !important ; + display: none !important; } - .visible-tablet { + .hidden-phone { display: inherit !important; } .hidden-tablet { display: none !important; } -} - -@media (max-width: 767px) { .hidden-desktop { display: inherit !important; } - .visible-desktop { +} + +@media (min-width: 980px) { + .visible-phone { display: none !important; } - .visible-phone { + .visible-tablet { + display: none !important; + } + .visible-desktop { display: inherit !important; } .hidden-phone { + display: inherit !important; + } + .hidden-tablet { + display: inherit !important; + } + .hidden-desktop { display: none !important; } } -- cgit v1.2.3 From dc4436dbc9f328f4ad6ee391b6836b6c8d0324c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 15:36:11 -0700 Subject: Only use .danger for alerts, no more .error --- docs/assets/css/bootstrap.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d24999c4a..4553a1592 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4663,22 +4663,18 @@ button.close { color: #356635; } -.alert-danger, -.alert-error { +.alert-danger { color: #b94a48; background-color: #f2dede; border-color: #eed3d7; } -.alert-danger hr, -.alert-error hr { +.alert-danger hr { border-top-color: #e6c1c7; } .alert-danger > a, -.alert-error > a, -.alert-danger > p > a, -.alert-error > p > a { +.alert-danger > p > a { color: #953b39; } -- cgit v1.2.3 From 30d6e0530effef6379fb555491bc5064668f3359 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 14:50:44 -0700 Subject: Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4553a1592..53f9a9693 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5300,6 +5300,12 @@ a.list-group-item.active > .badge, width: device-width; } +@media screen and (max-width: 400px) { + @-ms-viewport { + width: 320px; + } +} + .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 364f8330a159f9448833d88740e259219883d404 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 18:29:06 -0700 Subject: Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars --- 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 53f9a9693..f40720bf4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4711,7 +4711,8 @@ button.close { .img-thumbnail { padding: 4px; line-height: 20px; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -4741,7 +4742,7 @@ a.thumbnail:focus { .thumbnail .caption { padding: 9px; - color: #555555; + color: #333333; } .media, -- cgit v1.2.3 From e0d60b1325591a347d9e49e44be6d77401b07749 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 19:35:36 -0700 Subject: Fixes #7617: lowercase and dash gray color vars --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 f40720bf4..624daf46c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3471,8 +3471,8 @@ button.close { .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { color: #fff; - background-color: @grayLight; - border-color: @grayLight; + background-color: @gray-light; + border-color: @gray-light; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, @@ -3484,7 +3484,7 @@ button.close { // Dropdowns in stacked tabs .tabs-stacked .open > a:hover { - border-color: @grayLight; + border-color: @gray-light; } */ -- cgit v1.2.3 From 55bbb9ffd704353140cb1d42804ecd99f576f642 Mon Sep 17 00:00:00 2001 From: Artur Kwiatkowski Date: Mon, 22 Apr 2013 15:34:23 +0200 Subject: Nuked local .a() mixins and simplified the nesting --- docs/assets/css/bootstrap.css | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3a6866785..c7e2b4eb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4795,7 +4795,9 @@ a.thumbnail:focus { border-radius: .25em; } +.label[href]:hover, a.label:hover, +.label[href]:focus, a.label:focus { color: #fff; text-decoration: none; @@ -4810,14 +4812,6 @@ a.label:focus { background-color: #c9302c; } -.label-warning { - background-color: #f0ad4e; -} - -.label-warning[href] { - background-color: #ec971f; -} - .label-success { background-color: #5cb85c; } @@ -4826,6 +4820,14 @@ a.label:focus { background-color: #449d44; } +.label-warning { + background-color: #f0ad4e; +} + +.label-warning[href] { + background-color: #ec971f; +} + .label-info { background-color: #5bc0de; } -- cgit v1.2.3 From 57ba494409f91f63b1b1a6ac3d2e74da9635135e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Apr 2013 10:44:44 -0700 Subject: running make --- docs/assets/css/bootstrap.css | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c7e2b4eb1..f8db46767 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4796,19 +4796,19 @@ a.thumbnail:focus { } .label[href]:hover, -a.label:hover, -.label[href]:focus, -a.label:focus { +.label[href]:focus { color: #fff; text-decoration: none; cursor: pointer; + background-color: #808080; } .label-danger { background-color: #d9534f; } -.label-danger[href] { +.label-danger[href]:hover, +.label-danger[href]:focus { background-color: #c9302c; } @@ -4816,7 +4816,8 @@ a.label:focus { background-color: #5cb85c; } -.label-success[href] { +.label-success[href]:hover, +.label-success[href]:focus { background-color: #449d44; } @@ -4824,7 +4825,8 @@ a.label:focus { background-color: #f0ad4e; } -.label-warning[href] { +.label-warning[href]:hover, +.label-warning[href]:focus { background-color: #ec971f; } @@ -4832,7 +4834,8 @@ a.label:focus { background-color: #5bc0de; } -.label-info[href] { +.label-info[href]:hover, +.label-info[href]:focus { background-color: #31b0d5; } -- cgit v1.2.3 From 8ae9c6ab34128ea863343abaeff39ca7c6f4618c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Apr 2013 23:13:04 -0700 Subject: Fixes #7688: move font-weight for glyphicons to before pseudo element --- docs/assets/css/bootstrap.css | 5 ++--- 1 file changed, 2 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 f8db46767..70b610e52 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2147,15 +2147,14 @@ fieldset[disabled] .btn-link:focus { @font-face { font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; src: url('../fonts/glyphiconshalflings-regular.eot'); src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -.glyphicon:before { +.glyphicon::before { font-family: 'Glyphicons Halflings'; font-style: normal; + font-weight: normal; line-height: 1; } -- cgit v1.2.3 From efd3b0c1711a443e5ad97c6278addadfe2cedc5d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Apr 2013 23:59:51 -0700 Subject: Back to two grid classes, .col and .col-lg-* --- docs/assets/css/bootstrap.css | 73 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 70b610e52..380a75738 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -784,107 +784,98 @@ pre code { margin-left: -15px; } -[class*="col-span-"], -[class*="col-small-"] { +.col { position: relative; + float: left; + width: 100%; min-height: 1px; padding-right: 15px; padding-left: 15px; } -[class*="col-small-"] { - float: left; -} - -.col-small-span-12 { +.col-sm-12 { width: 100%; } -.col-small-span-11 { +.col-sm-11 { width: 91.66666666666666%; } -.col-small-span-10 { +.col-sm-10 { width: 83.33333333333334%; } -.col-small-span-9 { +.col-sm-9 { width: 75%; } -.col-small-span-8 { +.col-sm-8 { width: 66.66666666666666%; } -.col-small-span-7 { +.col-sm-7 { width: 58.333333333333336%; } -.col-small-span-6 { +.col-sm-6 { width: 50%; } -.col-small-span-5 { +.col-sm-5 { width: 41.66666666666667%; } -.col-small-span-4 { +.col-sm-4 { width: 33.33333333333333%; } -.col-small-span-3 { +.col-sm-3 { width: 25%; } -.col-small-span-2 { +.col-sm-2 { width: 16.666666666666664%; } -.col-small-span-1 { +.col-sm-1 { width: 8.333333333333332%; } @media screen and (min-width: 768px) { - .container { - max-width: 728px; - } - [class*="col-span-"] { - float: left; - } - .col-span-12 { + .col-lg-12 { width: 100%; } - .col-span-11 { + .col-lg-11 { width: 91.66666666666666%; } - .col-span-10 { + .col-lg-10 { width: 83.33333333333334%; } - .col-span-9 { + .col-lg-9 { width: 75%; } - .col-span-8 { + .col-lg-8 { width: 66.66666666666666%; } - .col-span-7 { + .col-lg-7 { width: 58.333333333333336%; } - .col-span-6 { + .col-lg-6 { width: 50%; } - .col-span-5 { + .col-lg-5 { width: 41.66666666666667%; } - .col-span-4 { + .col-lg-4 { width: 33.33333333333333%; } - .col-span-3 { + .col-lg-3 { width: 25%; } - .col-span-2 { + .col-lg-2 { width: 16.666666666666664%; } - .col-span-1 { + .col-lg-1 { width: 8.333333333333332%; } .col-offset-12 { @@ -997,6 +988,12 @@ pre code { } } +@media screen and (min-width: 768px) { + .container { + max-width: 728px; + } +} + @media screen and (min-width: 992px) { .container { max-width: 940px; @@ -1009,9 +1006,9 @@ pre code { } } -[class*="col-span-"].pull-right { +/*[class*="col-span-"].pull-right { float: right; -} +}*/ table { max-width: 100%; -- cgit v1.2.3 From 9ce7f22e991804cd08c4dc612cd929d07dc0a28f Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 27 Apr 2013 18:47:47 +0200 Subject: Adding media queries breakpoints variables --- 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 70b610e52..2b4ca441f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5341,7 +5341,7 @@ a.list-group-item.active > .badge, display: inherit !important; } -@media (min-width: 768px) and (max-width: 979px) { +@media (min-width: 768px) and (max-width: 992px) { .visible-phone { display: none !important; } @@ -5362,7 +5362,7 @@ a.list-group-item.active > .badge, } } -@media (min-width: 980px) { +@media (min-width: 992px) { .visible-phone { display: none !important; } -- cgit v1.2.3 From 2ffa0e44094ab67e23fb1642d6b1b8d269d3a2f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 Apr 2013 11:55:45 -0700 Subject: Add maximum bounds variables for so our responsive utilities don't overlap --- 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 2b4ca441f..be8236ea3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5341,7 +5341,7 @@ a.list-group-item.active > .badge, display: inherit !important; } -@media (min-width: 768px) and (max-width: 992px) { +@media (min-width: 768px) and (max-width: 991px) { .visible-phone { display: none !important; } -- cgit v1.2.3 From 8b3a1702d443c4a451d02d3482ed2cb4aeff0d44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 Apr 2013 18:28:39 -0700 Subject: Overhaul navbar navs * Switch from to to eliminate an element in selectors * Drop .navbar-divider entirely --- docs/assets/css/bootstrap.css | 129 +++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 84 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index be8236ea3..b4a3b5854 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3515,33 +3515,33 @@ button.close { clear: both; } -.navbar .nav { +.navbar-nav { margin-top: 15px; } -.navbar .nav > li > a { +.navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px; line-height: 20px; color: #777777; } -.navbar .nav > li > a:hover, -.navbar .nav > li > a:focus { +.navbar-nav > li > a:hover, +.navbar-nav > li > a:focus { color: #333333; background-color: transparent; } -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { +.navbar-nav > .active > a, +.navbar-nav > .active > a:hover, +.navbar-nav > .active > a:focus { color: #555555; background-color: #d5d5d5; } -.navbar .nav > .disabled > a, -.navbar .nav > .disabled > a:hover, -.navbar .nav > .disabled > a:focus { +.navbar-nav > .disabled > a, +.navbar-nav > .disabled > a:hover, +.navbar-nav > .disabled > a:focus { color: #cccccc; background-color: transparent; } @@ -3570,7 +3570,7 @@ button.close { .navbar-brand { display: block; max-width: 200px; - padding: 7px 15px; + padding: 15px; margin-right: auto; margin-left: auto; font-size: 18px; @@ -3614,57 +3614,49 @@ button.close { margin-top: 4px; } -.navbar .nav > .divider { - height: 2px; - margin: 9px 0; - overflow: hidden; - background-color: #e1e1e1; - border-bottom: 1px solid #fbfbfb; -} - .navbar-form { margin-top: 8px; margin-bottom: 8px; } -.navbar .nav > li > .dropdown-menu { +.navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0; } -.navbar-fixed-bottom .nav > li > .dropdown-menu { +.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.navbar .nav li.dropdown > a:hover .caret, -.navbar .nav li.dropdown > a:focus .caret { +.navbar-nav li.dropdown > a:hover .caret, +.navbar-nav li.dropdown > a:focus .caret { border-top-color: #333333; border-bottom-color: #333333; } -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { +.navbar-nav li.dropdown.open > .dropdown-toggle, +.navbar-nav li.dropdown.active > .dropdown-toggle, +.navbar-nav li.dropdown.open.active > .dropdown-toggle { color: #555555; background-color: #d5d5d5; } -.navbar .nav li.dropdown > .dropdown-toggle .caret { +.navbar-nav li.dropdown > .dropdown-toggle .caret { border-top-color: #777777; border-bottom-color: #777777; } -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { +.navbar-nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-nav li.dropdown.open.active > .dropdown-toggle .caret { border-top-color: #555555; border-bottom-color: #555555; } -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { +.navbar-nav.pull-right > li > .dropdown-menu, +.navbar-nav > li > .dropdown-menu.pull-right { right: 0; left: auto; } @@ -3687,26 +3679,26 @@ button.close { color: #999999; } -.navbar-inverse .nav > li > a { +.navbar-inverse .navbar-nav > li > a { color: #999999; } -.navbar-inverse .nav > li > a:hover, -.navbar-inverse .nav > li > a:focus { +.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:focus { color: #ffffff; background-color: transparent; } -.navbar-inverse .nav > .active > a, -.navbar-inverse .nav > .active > a:hover, -.navbar-inverse .nav > .active > a:focus { +.navbar-inverse .navbar-nav > .active > a, +.navbar-inverse .navbar-nav > .active > a:hover, +.navbar-inverse .navbar-nav > .active > a:focus { color: #ffffff; background-color: #080808; } -.navbar-inverse .nav > .disabled > a, -.navbar-inverse .nav > .disabled > a:hover, -.navbar-inverse .nav > .disabled > a:focus { +.navbar-inverse .navbar-nav > .disabled > a, +.navbar-inverse .navbar-nav > .disabled > a:hover, +.navbar-inverse .navbar-nav > .disabled > a:focus { color: #444444; background-color: transparent; } @@ -3724,31 +3716,26 @@ button.close { background-color: #fff; } -.navbar-inverse .nav > .divider { - background-color: #151515; - border-bottom-color: #2f2f2f; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { +.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle { color: #ffffff; background-color: #080808; } -.navbar-inverse .nav li.dropdown > a:hover .caret { +.navbar-inverse .navbar-nav li.dropdown > a:hover .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; } -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { +.navbar-inverse .navbar-nav li.dropdown > .dropdown-toggle .caret { border-top-color: #999999; border-bottom-color: #999999; } -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { +.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; } @@ -3760,36 +3747,19 @@ button.close { } .navbar-brand { float: left; - padding-top: 15px; - padding-bottom: 15px; - margin-left: -10px; + margin-right: 5px; + margin-left: -5px; } .navbar .nav { float: left; margin-top: 0; } - .navbar .nav:before, - .navbar .nav:after { - display: table; - content: " "; - } - .navbar .nav:after { - clear: both; - } - .navbar .nav:before, - .navbar .nav:after { - display: table; - content: " "; - } - .navbar .nav:after { - clear: both; + .navbar .nav > li { + float: left; } .navbar .nav.pull-right { float: right; } - .navbar .nav > li { - float: left; - } .navbar .nav > .divider { width: 1px; height: 30px; @@ -3800,15 +3770,6 @@ button.close { .navbar-inverse .nav > .divider { border-right-color: #2f2f2f; } - .navbar-fixed-left { - padding-right: 0; - padding-left: 0; - } - .navbar-fixed-left .navbar-brand, - .navbar-fixed-left .nav, - .navbar-fixed-left .nav > li { - float: none; - } .navbar-toggle { position: relative; top: auto; -- cgit v1.2.3 From 3326e1b21e2368878a1c7f7bbd8d31d58fff5276 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 28 Apr 2013 10:08:48 -0400 Subject: Fix navbar on phone/tablet devices after navbar overhaul --- docs/assets/css/bootstrap.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b4a3b5854..888730f7a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3490,7 +3490,7 @@ button.close { .navbar { position: relative; - padding: 10px 15px; + padding: 0 15px; background-color: #eeeeee; border-radius: 4px; } @@ -3741,10 +3741,6 @@ button.close { } @media screen and (min-width: 768px) { - .navbar { - padding-top: 0; - padding-bottom: 0; - } .navbar-brand { float: left; margin-right: 5px; -- cgit v1.2.3 From bbee78b30b40ff0b1473a06ea7ecf5a42d51b614 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 28 Apr 2013 14:27:48 -0700 Subject: derp on navbar toggle and docs positions --- 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 b4a3b5854..5e5d325a6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3516,7 +3516,7 @@ button.close { } .navbar-nav { - margin-top: 15px; + margin-top: 5px; } .navbar-nav > li > a { -- cgit v1.2.3 From 447be1b3264eac4b22edc1584a6cb6f098bb2d7c Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 28 Apr 2013 21:51:02 -0400 Subject: Cleanup breadcrumb divider last item Modify to hide both padding and leading/trailing whitespace Thanks to https://github.com/holic for suggestion --- 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 97e43f22c..12d4e5021 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4024,7 +4024,7 @@ button.close { } .breadcrumb > li:last-child:after { - content: ""; + display: none; } .breadcrumb > .active { -- cgit v1.2.3 From e13d05317ee5a944bdf34c1dda65bcc30a7915f6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 28 Apr 2013 22:45:56 -0700 Subject: single colon pseudo element for ie8 --- 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 97e43f22c..4a57ea259 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2148,7 +2148,7 @@ fieldset[disabled] .btn-link:focus { src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -.glyphicon::before { +.glyphicon:before { font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; -- cgit v1.2.3 From e8b731864608d2f86db37705880ec92136e7347a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 30 Apr 2013 19:07:28 -0700 Subject: no need for zero padding on navbar top/bottom; better comment --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 ecf7c7585..12a4d691f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3487,7 +3487,8 @@ button.close { .navbar { position: relative; - padding: 0 15px; + padding-top: 15px; + padding-bottom: 15px; background-color: #eeeeee; border-radius: 4px; } -- cgit v1.2.3 From 69f5447afab3209cee5f96097447df058084d1c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 30 Apr 2013 19:12:48 -0700 Subject: add back bottom margin to navbars --- 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 12a4d691f..3dd8bc5b1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3489,6 +3489,7 @@ button.close { position: relative; padding-top: 15px; padding-bottom: 15px; + margin-bottom: 20px; background-color: #eeeeee; border-radius: 4px; } -- cgit v1.2.3 From 0780faad45d106fbe8bd0de64e1cdfb3d6117d0e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 30 Apr 2013 19:20:41 -0700 Subject: make that left/right padding, not top/bottom on navbar --- 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 3dd8bc5b1..7b3575426 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3487,8 +3487,8 @@ button.close { .navbar { position: relative; - padding-top: 15px; - padding-bottom: 15px; + padding-right: 15px; + padding-left: 15px; margin-bottom: 20px; background-color: #eeeeee; border-radius: 4px; -- cgit v1.2.3 From 47155e8aa38856ff928be02b33454ae79d84aa2e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 30 Apr 2013 19:35:52 -0700 Subject: outdent the rows for tablets and above --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7b3575426..1f338a871 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -992,6 +992,10 @@ pre code { .container { max-width: 728px; } + .row { + margin-right: -15px; + margin-left: -15px; + } } @media screen and (min-width: 992px) { -- cgit v1.2.3 From 9cd3a92713bb8e2b78ea6496f69ee14ce1e46b3f Mon Sep 17 00:00:00 2001 From: DarDar Date: Wed, 24 Apr 2013 00:41:06 +0200 Subject: Use @font-size-... variables instead of hardcoded font-size in px --- docs/assets/css/bootstrap.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1f338a871..2bd9a2119 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3192,9 +3192,9 @@ a.list-group-item.active .list-group-item-text { .close { float: right; - font-size: 20px; + font-size: 21px; font-weight: bold; - line-height: 20px; + line-height: 1; color: #000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; @@ -3382,7 +3382,7 @@ button.close { .nav-header { display: block; padding: 3px 15px; - font-size: 11px; + font-size: 10.5px; font-weight: bold; line-height: 20px; color: #999999; @@ -3576,7 +3576,7 @@ button.close { padding: 15px; margin-right: auto; margin-left: auto; - font-size: 18px; + font-size: 17.5px; font-weight: 500; line-height: 20px; color: #777777; @@ -4355,7 +4355,7 @@ button.close { position: absolute; z-index: 1030; display: block; - font-size: 11px; + font-size: 10.5px; line-height: 1.4; opacity: 0; filter: alpha(opacity=0); @@ -4802,7 +4802,7 @@ a.thumbnail:focus { display: inline-block; min-width: 10px; padding: 3px 7px; - font-size: 12px; + font-size: 11.9px; font-weight: bold; line-height: 1; color: #fff; @@ -4902,7 +4902,7 @@ a.list-group-item.active > .badge, float: left; width: 0; height: 100%; - font-size: 12px; + font-size: 11.9px; color: #fff; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -5216,7 +5216,7 @@ a.list-group-item.active > .badge, border-radius: 6px; } .jumbotron h1 { - font-size: 60px; + font-size: 63px; } } -- cgit v1.2.3 From 08fea3304ac8393ca5f549082f7e195e1762fb40 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Fri, 3 May 2013 15:27:10 +1200 Subject: Fix input border flicker in Chrome from @garoevans, closes #7689 --- 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 1f338a871..281508ac0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1261,10 +1261,10 @@ input[type="color"] { border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; + -webkit-transition: border-color linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border-color linear 0.2s, box-shadow linear 0.2s; + -o-transition: border-color linear 0.2s, box-shadow linear 0.2s; + transition: border-color linear 0.2s, box-shadow linear 0.2s; } input, -- cgit v1.2.3 From 1587b8948f3f1e2471c3bf4005a8ba722bffc78d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 May 2013 10:53:26 -0700 Subject: run make on previous commits --- docs/assets/css/bootstrap.css | 75 +++++++++---------------------------------- 1 file changed, 15 insertions(+), 60 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1f338a871..5f867fa2f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1396,15 +1396,17 @@ textarea::-webkit-input-placeholder { margin-top: -5px; } +/* +// Move the options list down to align with labels .controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; + padding-top: 5px; // has to be padding because margin collaspes } +*/ .radio-inline, .checkbox-inline { display: inline-block; - padding-top: 5px; padding-left: 20px; margin-bottom: 0; font-weight: normal; @@ -3759,16 +3761,6 @@ button.close { .navbar .nav.pull-right { float: right; } - .navbar .nav > .divider { - width: 1px; - height: 30px; - margin: 10px 9px; - border-right: 1px solid #fbfbfb; - border-bottom: 0; - } - .navbar-inverse .nav > .divider { - border-right-color: #2f2f2f; - } .navbar-toggle { position: relative; top: auto; @@ -3781,62 +3773,25 @@ button.close { } } -/* +.navbar-btn { + margin-top: 8px; +} -// Janky solution for now to account for links outside the .nav -// ------------------------- .navbar-link { - color: @navbar-link-color; - &:hover { - color: @navbar-link-hover-color; - } + color: #777777; } -// Buttons in navbar -// ------------------------- -.navbar .btn, -.navbar .btn-group { - .navbarVerticalAlign(30px); // Vertically center in navbar -} -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; // then undo the margin here so we don't accidentally double it +.navbar-link:hover { + color: #333333; } -// Navbar forms -// ------------------------- -.navbar-form { - margin-bottom: 0; // remove default bottom margin - .clearfix(); - input, - select, - .radio, - .checkbox { - .navbarVerticalAlign(30px); // Vertically center in navbar - } - input, - select, - .btn { - display: inline-block; - margin-bottom: 0; - } - input[type="image"], - input[type="checkbox"], - input[type="radio"] { - margin-top: 3px; - } - .input-append, - .input-prepend { - margin-top: 5px; - white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left - input { - margin-top: 0; // remove the margin on top since it's on the parent - } - } +.navbar-inverse .navbar-link { + color: #999999; } -*/ +.navbar-inverse .navbar-link:hover { + color: #ffffff; +} .btn .caret { border-top-color: #ffffff; -- cgit v1.2.3 From b5d68f59c20bbc9bd0290950d0d04db417697843 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 May 2013 11:56:00 -0700 Subject: Add cursor: pointer; to .checkbox and .radio and their inline counterparts --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5f867fa2f..0216ffc5b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1381,6 +1381,7 @@ textarea::-webkit-input-placeholder { display: inline; margin-bottom: 0; font-weight: normal; + cursor: pointer; } .radio input[type="radio"], @@ -1411,6 +1412,7 @@ textarea::-webkit-input-placeholder { margin-bottom: 0; font-weight: normal; vertical-align: middle; + cursor: pointer; } .radio-inline + .radio-inline, -- cgit v1.2.3 From e1d947f53e0591f2765290784f9e09f46e002558 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 May 2013 14:56:57 -0700 Subject: Scope .table-bordered styles to immediate children only --- docs/assets/css/bootstrap.css | 78 +++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a17a47128..9df8dc84e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1073,72 +1073,72 @@ th { border-radius: 4px; } -.table-bordered thead > tr > th, -.table-bordered tbody > tr > th, -.table-bordered thead > tr > td, -.table-bordered tbody > tr > td { +.table-bordered > thead > tr > th, +.table-bordered > tbody > tr > th, +.table-bordered > thead > tr > td, +.table-bordered > tbody > tr > td { border-left: 1px solid #dddddd; } -.table-bordered caption + thead > tr:first-child th, -.table-bordered caption + tbody > tr:first-child th, -.table-bordered caption + tbody > tr:first-child td, -.table-bordered colgroup + thead > tr:first-child th, -.table-bordered colgroup + tbody > tr:first-child th, -.table-bordered colgroup + tbody > tr:first-child td, -.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 { +.table-bordered > caption + thead > tr:first-child th, +.table-bordered > caption + tbody > tr:first-child th, +.table-bordered > caption + tbody > tr:first-child td, +.table-bordered > colgroup + thead > tr:first-child th, +.table-bordered > colgroup + tbody > tr:first-child th, +.table-bordered > colgroup + tbody > tr:first-child td, +.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; } -.table-bordered thead:first-child > tr:first-child > th:first-child, -.table-bordered tbody:first-child > tr:first-child > td:first-child, -.table-bordered tbody:first-child > tr:first-child > th:first-child { +.table-bordered > thead:first-child > tr:first-child > th:first-child, +.table-bordered > tbody:first-child > tr:first-child > td:first-child, +.table-bordered > tbody:first-child > tr:first-child > th:first-child { border-top-left-radius: 4px; } -.table-bordered thead:first-child > tr:first-child > th:last-child, -.table-bordered tbody:first-child > tr:first-child > td:last-child, -.table-bordered tbody:first-child > tr:first-child > th:last-child { +.table-bordered > thead:first-child > tr:first-child > th:last-child, +.table-bordered > tbody:first-child > tr:first-child > td:last-child, +.table-bordered > tbody:first-child > tr:first-child > th:last-child { border-top-right-radius: 4px; } -.table-bordered thead:last-child > tr:last-child > th:first-child, -.table-bordered tbody:last-child > tr:last-child > td:first-child, -.table-bordered tbody:last-child > tr:last-child > th:first-child, -.table-bordered tfoot:last-child > tr:last-child > td:first-child, -.table-bordered tfoot:last-child > tr:last-child > th:first-child { +.table-bordered > thead:last-child > tr:last-child > th:first-child, +.table-bordered > tbody:last-child > tr:last-child > td:first-child, +.table-bordered > tbody:last-child > tr:last-child > th:first-child, +.table-bordered > tfoot:last-child > tr:last-child > td:first-child, +.table-bordered > tfoot:last-child > tr:last-child > th:first-child { border-bottom-left-radius: 4px; } -.table-bordered thead:last-child > tr:last-child > th:last-child, -.table-bordered tbody:last-child > tr:last-child > td:last-child, -.table-bordered tbody:last-child > tr:last-child > th:last-child, -.table-bordered tfoot:last-child > tr:last-child > td:last-child, -.table-bordered tfoot:last-child > tr:last-child > th:last-child { +.table-bordered > thead:last-child > tr:last-child > th:last-child, +.table-bordered > tbody:last-child > tr:last-child > td:last-child, +.table-bordered > tbody:last-child > tr:last-child > th:last-child, +.table-bordered > tfoot:last-child > tr:last-child > td:last-child, +.table-bordered > tfoot:last-child > tr:last-child > th:last-child { border-bottom-right-radius: 4px; } -.table-bordered tfoot + tbody:last-child > tr:last-child > td:first-child { +.table-bordered > tfoot + tbody:last-child > tr:last-child > td:first-child { border-bottom-left-radius: 0; } -.table-bordered tfoot + tbody:last-child > tr:last-child > td:last-child { +.table-bordered > tfoot + tbody:last-child > tr:last-child > td:last-child { border-bottom-right-radius: 0; } -.table-bordered caption + thead > tr:first-child > th:first-child, -.table-bordered caption + tbody > tr:first-child > td:first-child, -.table-bordered colgroup + thead > tr:first-child > th:first-child, -.table-bordered colgroup + tbody > tr:first-child > td:first-child { +.table-bordered > caption + thead > tr:first-child > th:first-child, +.table-bordered > caption + tbody > tr:first-child > td:first-child, +.table-bordered > colgroup + thead > tr:first-child > th:first-child, +.table-bordered > colgroup + tbody > tr:first-child > td:first-child { border-top-left-radius: 4px; } -.table-bordered caption + thead > tr:first-child > th:last-child, -.table-bordered caption + tbody > tr:first-child > td:last-child, -.table-bordered colgroup + thead > tr:first-child > th:last-child, -.table-bordered colgroup + tbody > tr:first-child > td:last-child { +.table-bordered > caption + thead > tr:first-child > th:last-child, +.table-bordered > caption + tbody > tr:first-child > td:last-child, +.table-bordered > colgroup + thead > tr:first-child > th:last-child, +.table-bordered > colgroup + tbody > tr:first-child > td:last-child { border-top-right-radius: 4px; } -- cgit v1.2.3 From a6f7f96a93a650fc7e71337c836f0221433b65f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 May 2013 15:29:10 -0700 Subject: recompile after last justified nav tweaks --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 58b775060..131b0c6fa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3332,6 +3332,9 @@ button.close { display: table-cell; float: none; width: 1%; +} + +.nav-tabs.nav-justified > li > a { text-align: center; } @@ -3380,6 +3383,9 @@ button.close { display: table-cell; float: none; width: 1%; +} + +.nav-justified > li > a { text-align: center; } -- cgit v1.2.3 From 7d41a387693c49347e06572ceb7ec2207ee30d46 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 May 2013 16:16:26 -0700 Subject: Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups --- docs/assets/css/bootstrap.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 131b0c6fa..e1260c7d5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3889,6 +3889,25 @@ button.close { border-bottom-right-radius: 6px; } +.btn-group > .btn-group { + float: left; +} + +.btn-group > .btn-group > .btn { + border-radius: 0; +} + +.btn-group > .btn-group:last-child > .btn { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.btn-group > .btn-group:first-child > .btn { + margin-left: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} + .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; -- cgit v1.2.3 From dcf7cc084d6b2d0522860c4c9be6e914c67ab91a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 May 2013 13:11:20 -0700 Subject: Fixes #7783: nuke bottom margin on fixed-bottom-navbar --- 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 e1260c7d5..eba96cb30 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3578,6 +3578,7 @@ button.close { .navbar-fixed-bottom { bottom: 0; + margin-bottom: 0; } .navbar-brand { -- cgit v1.2.3