diff options
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 112 |
1 files changed, 69 insertions, 43 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6bd664017..f26735075 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -935,6 +935,7 @@ img { .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; + width: 100% \9; max-width: 100%; height: auto; } @@ -943,6 +944,7 @@ img { } .img-thumbnail { display: inline-block; + width: 100% \9; max-width: 100%; height: auto; padding: 4px; @@ -1025,7 +1027,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #999; + color: #777; } h1, .h1, @@ -1148,7 +1150,7 @@ mark, text-transform: capitalize; } .text-muted { - color: #999; + color: #777; } .text-primary { color: #428bca; @@ -1272,7 +1274,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #999; + border-bottom: 1px dotted #777; } .initialism { font-size: 90%; @@ -1295,7 +1297,7 @@ blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; - color: #999; + color: #777; } blockquote footer:before, blockquote small:before, @@ -2373,14 +2375,14 @@ output { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } .form-control::-moz-placeholder { - color: #999; + color: #777; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999; + color: #777; } .form-control::-webkit-input-placeholder { - color: #999; + color: #777; } .form-control[disabled], .form-control[readonly], @@ -2478,7 +2480,18 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } -.input-sm { +.form-control-static { + padding-top: 7px; + padding-bottom: 7px; + margin-bottom: 0; +} +.form-control-static.input-lg, +.form-control-static.input-sm { + padding-right: 0; + padding-left: 0; +} +.input-sm, +.form-horizontal .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; @@ -2493,7 +2506,8 @@ textarea.input-sm, select[multiple].input-sm { height: auto; } -.input-lg { +.input-lg, +.form-horizontal .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; @@ -2616,9 +2630,6 @@ select[multiple].input-lg { .has-feedback label.sr-only ~ .form-control-feedback { top: 0; } -.form-control-static { - margin-bottom: 0; -} .help-block { display: block; margin-top: 5px; @@ -2688,10 +2699,6 @@ select[multiple].input-lg { margin-right: -15px; margin-left: -15px; } -.form-horizontal .form-control-static { - padding-top: 7px; - padding-bottom: 7px; -} @media (min-width: 768px) { .form-horizontal .control-label { padding-top: 7px; @@ -2703,6 +2710,16 @@ select[multiple].input-lg { top: 0; right: 15px; } +@media (min-width: 768px) { + .form-horizontal .form-group-lg .control-label { + padding-top: 14.3px; + } +} +@media (min-width: 768px) { + .form-horizontal .form-group-sm .control-label { + padding-top: 6px; + } +} .btn { display: inline-block; padding: 6px 12px; @@ -3027,7 +3044,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #999; + color: #777; text-decoration: none; } .btn-lg, @@ -3054,8 +3071,6 @@ fieldset[disabled] .btn-link:focus { .btn-block { display: block; width: 100%; - padding-right: 0; - padding-left: 0; } .btn-block + .btn-block { margin-top: 5px; @@ -3168,7 +3183,7 @@ tbody.collapse.in { .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999; + color: #777; } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { @@ -3197,7 +3212,8 @@ tbody.collapse.in { padding: 3px 20px; font-size: 12px; line-height: 1.42857143; - color: #999; + color: #777; + white-space: nowrap; } .dropdown-backdrop { position: fixed; @@ -3578,11 +3594,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: #eee; } .nav > li.disabled > a { - color: #999; + color: #777; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #999; + color: #777; text-decoration: none; cursor: not-allowed; background-color: transparent; @@ -4176,7 +4192,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-color: #080808; } .navbar-inverse .navbar-brand { - color: #999; + color: #777; } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { @@ -4184,10 +4200,10 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: transparent; } .navbar-inverse .navbar-text { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { @@ -4234,7 +4250,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { @@ -4255,13 +4271,13 @@ fieldset[disabled] .navbar-default .btn-link:focus { } } .navbar-inverse .navbar-link { - color: #999; + color: #777; } .navbar-inverse .navbar-link:hover { color: #fff; } .navbar-inverse .btn-link { - color: #999; + color: #777; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { @@ -4289,7 +4305,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { content: "/\00a0"; } .breadcrumb > .active { - color: #999; + color: #777; } .pagination { display: inline-block; @@ -4349,7 +4365,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; border-color: #ddd; @@ -4418,7 +4434,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; } @@ -4448,11 +4464,11 @@ a.label:focus { top: -1px; } .label-default { - background-color: #999; + background-color: #777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #808080; + background-color: #5e5e5e; } .label-primary { background-color: #428bca; @@ -4500,7 +4516,7 @@ a.label:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - background-color: #999; + background-color: #777; border-radius: 10px; } .badge:empty { @@ -4612,10 +4628,12 @@ a.thumbnail.active { .alert > p + p { margin-top: 5px; } -.alert-dismissable { +.alert-dismissable, +.alert-dismissible { padding-right: 35px; } -.alert-dismissable .close { +.alert-dismissable .close, +.alert-dismissible .close { position: relative; top: -2px; right: -21px; @@ -4713,14 +4731,16 @@ a.thumbnail.active { -o-transition: width .6s ease; transition: width .6s ease; } -.progress-striped .progress-bar { +.progress-striped .progress-bar, +.progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px; } -.progress.active .progress-bar { +.progress.active .progress-bar, +.progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; @@ -4731,7 +4751,7 @@ a.thumbnail.active { } .progress-bar[aria-valuenow="0"] { min-width: 30px; - color: #999; + color: #777; background-color: transparent; background-image: none; -webkit-box-shadow: none; @@ -4839,7 +4859,7 @@ a.list-group-item:focus { .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - color: #999; + color: #777; background-color: #eee; } .list-group-item.disabled .list-group-item-heading, @@ -4850,7 +4870,7 @@ a.list-group-item:focus { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #999; + color: #777; } .list-group-item.active, .list-group-item.active:hover, @@ -4862,7 +4882,13 @@ a.list-group-item:focus { } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, -.list-group-item.active:focus .list-group-item-heading { +.list-group-item.active:focus .list-group-item-heading, +.list-group-item.active .list-group-item-heading > small, +.list-group-item.active:hover .list-group-item-heading > small, +.list-group-item.active:focus .list-group-item-heading > small, +.list-group-item.active .list-group-item-heading > .small, +.list-group-item.active:hover .list-group-item-heading > .small, +.list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } .list-group-item.active .list-group-item-text, |
