diff options
| author | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
| commit | fd62247bf8bbb1bce072f5ee03e996dfc4abed94 (patch) | |
| tree | 487766325e03d40c7af16c58873b70d8638a72ba /dist/css/bootstrap.css | |
| parent | fbf31f965e27a6665c7e0f2d97eb74c0df7585d4 (diff) | |
| parent | 2b86e05a6150ef13905519070ea82ce895fbae85 (diff) | |
| download | bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.tar.xz bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.zip | |
Merge branch 'master' into cover_template
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 439 |
1 files changed, 84 insertions, 355 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 261fc46de..4c1d7baba 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -450,6 +450,18 @@ small, cite { font-style: normal; } +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.text-justify { + text-align: justify; +} .text-muted { color: #999; } @@ -483,17 +495,36 @@ cite { .text-info:hover { color: #245269; } -.text-left { - text-align: left; +.bg-primary { + color: #fff; + background-color: #428bca; } -.text-right { - text-align: right; +a.bg-primary:hover { + background-color: #3071a9; } -.text-center { - text-align: center; +.bg-warning { + background-color: #fcf8e3; } -.text-justify { - text-align: justify; +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; +} +.bg-success { + background-color: #dff0d8; +} +a.bg-success:hover { + background-color: #c1e2b3; +} +.bg-info { + background-color: #d9edf7; +} +a.bg-info:hover { + background-color: #afd9ee; } .page-header { padding-bottom: 9px; @@ -2965,6 +2996,14 @@ input[type="button"].btn-block { .open > a { outline: 0; } +.dropdown-menu-right { + right: 0; + left: auto; +} +.dropdown-menu-left { + right: auto; + left: 0; +} .dropdown-header { display: block; padding: 3px 20px; @@ -3001,6 +3040,10 @@ input[type="button"].btn-block { right: 0; left: auto; } + .navbar-right .dropdown-menu-left { + right: auto; + left: 0; + } } .btn-group, .btn-group-vertical { @@ -3033,13 +3076,16 @@ input[type="button"].btn-block { .btn-group .btn-group + .btn-group { margin-left: -1px; } -.btn-toolbar .btn-group { +.btn-toolbar { + margin-left: -5px; +} +.btn-toolbar .btn-group, +.btn-toolbar .input-group { float: left; } -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group, -.btn-toolbar > .btn-group + .btn-group { +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { margin-left: 5px; } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { @@ -3193,6 +3239,7 @@ input[type="button"].btn-block { padding-left: 0; } .input-group .form-control { + float: left; width: 100%; margin-bottom: 0; } @@ -3312,9 +3359,15 @@ textarea.input-group-sm > .input-group-btn > .btn { .input-group-btn > .btn { position: relative; } +.input-group-btn > .btn:not(:first-of-type):not(:last-of-type) { + border-radius: 0; +} .input-group-btn > .btn + .btn { margin-left: -4px; } +.input-group-btn > .btn + .btn:last-of-type { + margin-left: -5px; +} .input-group-btn > .btn:hover, .input-group-btn > .btn:active { z-index: 2; @@ -3618,6 +3671,11 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-brand:focus { text-decoration: none; } +.navbar-brand > .glyphicon { + float: left; + margin-top: -2px; + margin-right: 5px; +} @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { @@ -3771,11 +3829,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.navbar-nav.pull-right > li > .dropdown-menu, -.navbar-nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} .navbar-btn { margin-top: 8px; margin-bottom: 8px; @@ -4225,19 +4278,17 @@ a.list-group-item.active > .badge, .jumbotron { padding: 30px; margin-bottom: 30px; - font-size: 21px; - font-weight: 200; - line-height: 2.1428571435; color: inherit; background-color: #eee; } .jumbotron h1, .jumbotron .h1 { - line-height: 1; color: inherit; } .jumbotron p { - line-height: 1.4; + margin-bottom: 15px; + font-size: 21px; + font-weight: 200; } .container .jumbotron { border-radius: 6px; @@ -4890,10 +4941,11 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1040; + z-index: 1050; display: none; overflow: auto; overflow-y: scroll; + outline: 0; } .modal.fade .modal-dialog { -webkit-transition: -webkit-transform .3s ease-out; @@ -4911,7 +4963,6 @@ button.close { } .modal-dialog { position: relative; - z-index: 1050; width: auto; margin: 10px; } @@ -4932,7 +4983,7 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1030; + z-index: 1040; background-color: #000; } .modal-backdrop.fade { @@ -4975,7 +5026,7 @@ button.close { .modal-footer .btn-block + .btn-block { margin-left: 0; } -@media screen and (min-width: 768px) { +@media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto; @@ -4984,6 +5035,12 @@ button.close { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5); box-shadow: 0 5px 15px rgba(0, 0, 0, .5); } + .modal-sm { + width: 300px; + } + .modal-lg { + width: 900px; + } } .tooltip { position: absolute; @@ -5488,72 +5545,12 @@ td.visible-xs { display: table-cell !important; } } -@media (min-width: 768px) and (max-width: 991px) { - .visible-xs.visible-sm { - display: block !important; - } - table.visible-xs.visible-sm { - display: table; - } - tr.visible-xs.visible-sm { - display: table-row !important; - } - th.visible-xs.visible-sm, - td.visible-xs.visible-sm { - display: table-cell !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .visible-xs.visible-md { - display: block !important; - } - table.visible-xs.visible-md { - display: table; - } - tr.visible-xs.visible-md { - display: table-row !important; - } - th.visible-xs.visible-md, - td.visible-xs.visible-md { - display: table-cell !important; - } -} -@media (min-width: 1200px) { - .visible-xs.visible-lg { - display: block !important; - } - table.visible-xs.visible-lg { - display: table; - } - tr.visible-xs.visible-lg { - display: table-row !important; - } - th.visible-xs.visible-lg, - td.visible-xs.visible-lg { - display: table-cell !important; - } -} .visible-sm, tr.visible-sm, th.visible-sm, td.visible-sm { display: none !important; } -@media (max-width: 767px) { - .visible-sm.visible-xs { - display: block !important; - } - table.visible-sm.visible-xs { - display: table; - } - tr.visible-sm.visible-xs { - display: table-row !important; - } - th.visible-sm.visible-xs, - td.visible-sm.visible-xs { - display: table-cell !important; - } -} @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; @@ -5569,72 +5566,12 @@ td.visible-sm { display: table-cell !important; } } -@media (min-width: 992px) and (max-width: 1199px) { - .visible-sm.visible-md { - display: block !important; - } - table.visible-sm.visible-md { - display: table; - } - tr.visible-sm.visible-md { - display: table-row !important; - } - th.visible-sm.visible-md, - td.visible-sm.visible-md { - display: table-cell !important; - } -} -@media (min-width: 1200px) { - .visible-sm.visible-lg { - display: block !important; - } - table.visible-sm.visible-lg { - display: table; - } - tr.visible-sm.visible-lg { - display: table-row !important; - } - th.visible-sm.visible-lg, - td.visible-sm.visible-lg { - display: table-cell !important; - } -} .visible-md, tr.visible-md, th.visible-md, td.visible-md { display: none !important; } -@media (max-width: 767px) { - .visible-md.visible-xs { - display: block !important; - } - table.visible-md.visible-xs { - display: table; - } - tr.visible-md.visible-xs { - display: table-row !important; - } - th.visible-md.visible-xs, - td.visible-md.visible-xs { - display: table-cell !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .visible-md.visible-sm { - display: block !important; - } - table.visible-md.visible-sm { - display: table; - } - tr.visible-md.visible-sm { - display: table-row !important; - } - th.visible-md.visible-sm, - td.visible-md.visible-sm { - display: table-cell !important; - } -} @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; @@ -5650,72 +5587,12 @@ td.visible-md { display: table-cell !important; } } -@media (min-width: 1200px) { - .visible-md.visible-lg { - display: block !important; - } - table.visible-md.visible-lg { - display: table; - } - tr.visible-md.visible-lg { - display: table-row !important; - } - th.visible-md.visible-lg, - td.visible-md.visible-lg { - display: table-cell !important; - } -} .visible-lg, tr.visible-lg, th.visible-lg, td.visible-lg { display: none !important; } -@media (max-width: 767px) { - .visible-lg.visible-xs { - display: block !important; - } - table.visible-lg.visible-xs { - display: table; - } - tr.visible-lg.visible-xs { - display: table-row !important; - } - th.visible-lg.visible-xs, - td.visible-lg.visible-xs { - display: table-cell !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .visible-lg.visible-sm { - display: block !important; - } - table.visible-lg.visible-sm { - display: table; - } - tr.visible-lg.visible-sm { - display: table-row !important; - } - th.visible-lg.visible-sm, - td.visible-lg.visible-sm { - display: table-cell !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .visible-lg.visible-md { - display: block !important; - } - table.visible-lg.visible-md { - display: table; - } - tr.visible-lg.visible-md { - display: table-row !important; - } - th.visible-lg.visible-md, - td.visible-lg.visible-md { - display: table-cell !important; - } -} @media (min-width: 1200px) { .visible-lg { display: block !important; @@ -5731,19 +5608,6 @@ td.visible-lg { display: table-cell !important; } } -.hidden-xs { - display: block !important; -} -table.hidden-xs { - display: table; -} -tr.hidden-xs { - display: table-row !important; -} -th.hidden-xs, -td.hidden-xs { - display: table-cell !important; -} @media (max-width: 767px) { .hidden-xs, tr.hidden-xs, @@ -5753,51 +5617,6 @@ td.hidden-xs { } } @media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm, - tr.hidden-xs.hidden-sm, - th.hidden-xs.hidden-sm, - td.hidden-xs.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md, - tr.hidden-xs.hidden-md, - th.hidden-xs.hidden-md, - td.hidden-xs.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { - .hidden-xs.hidden-lg, - tr.hidden-xs.hidden-lg, - th.hidden-xs.hidden-lg, - td.hidden-xs.hidden-lg { - display: none !important; - } -} -.hidden-sm { - display: block !important; -} -table.hidden-sm { - display: table; -} -tr.hidden-sm { - display: table-row !important; -} -th.hidden-sm, -td.hidden-sm { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-sm.hidden-xs, - tr.hidden-sm.hidden-xs, - th.hidden-sm.hidden-xs, - td.hidden-sm.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { .hidden-sm, tr.hidden-sm, th.hidden-sm, @@ -5806,51 +5625,6 @@ td.hidden-sm { } } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md, - tr.hidden-sm.hidden-md, - th.hidden-sm.hidden-md, - td.hidden-sm.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { - .hidden-sm.hidden-lg, - tr.hidden-sm.hidden-lg, - th.hidden-sm.hidden-lg, - td.hidden-sm.hidden-lg { - display: none !important; - } -} -.hidden-md { - display: block !important; -} -table.hidden-md { - display: table; -} -tr.hidden-md { - display: table-row !important; -} -th.hidden-md, -td.hidden-md { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-md.hidden-xs, - tr.hidden-md.hidden-xs, - th.hidden-md.hidden-xs, - td.hidden-md.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm, - tr.hidden-md.hidden-sm, - th.hidden-md.hidden-sm, - td.hidden-md.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { .hidden-md, tr.hidden-md, th.hidden-md, @@ -5859,51 +5633,6 @@ td.hidden-md { } } @media (min-width: 1200px) { - .hidden-md.hidden-lg, - tr.hidden-md.hidden-lg, - th.hidden-md.hidden-lg, - td.hidden-md.hidden-lg { - display: none !important; - } -} -.hidden-lg { - display: block !important; -} -table.hidden-lg { - display: table; -} -tr.hidden-lg { - display: table-row !important; -} -th.hidden-lg, -td.hidden-lg { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-lg.hidden-xs, - tr.hidden-lg.hidden-xs, - th.hidden-lg.hidden-xs, - td.hidden-lg.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm, - tr.hidden-lg.hidden-sm, - th.hidden-lg.hidden-sm, - td.hidden-lg.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md, - tr.hidden-lg.hidden-md, - th.hidden-lg.hidden-md, - td.hidden-lg.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { .hidden-lg, tr.hidden-lg, th.hidden-lg, |
