diff options
| author | Mark Otto <[email protected]> | 2016-10-02 19:40:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-02 19:40:39 -0700 |
| commit | 8a85f93aba52e1992b8e39efc7acceb2ecb7dcf7 (patch) | |
| tree | 240726dab544f73dddba7c3cc6b10116112f87bd /dist/css/bootstrap-flex.css | |
| parent | 54822bd549aa669c465a087969a06d7c3f4874fd (diff) | |
| download | bootstrap-8a85f93aba52e1992b8e39efc7acceb2ecb7dcf7.tar.xz bootstrap-8a85f93aba52e1992b8e39efc7acceb2ecb7dcf7.zip | |
grunt
Diffstat (limited to 'dist/css/bootstrap-flex.css')
| -rw-r--r-- | dist/css/bootstrap-flex.css | 100 |
1 files changed, 74 insertions, 26 deletions
diff --git a/dist/css/bootstrap-flex.css b/dist/css/bootstrap-flex.css index a925405b5..6f3ee28f6 100644 --- a/dist/css/bootstrap-flex.css +++ b/dist/css/bootstrap-flex.css @@ -474,7 +474,6 @@ select, textarea { margin: 0; line-height: inherit; - border-radius: 0; } input[type="radio"]:disabled, @@ -792,16 +791,72 @@ pre code { -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; - margin-left: -15px; margin-right: -15px; + margin-left: -15px; +} + +@media (min-width: 544px) { + .row { + margin-right: -15px; + margin-left: -15px; + } +} + +@media (min-width: 768px) { + .row { + margin-right: -15px; + margin-left: -15px; + } +} + +@media (min-width: 992px) { + .row { + margin-right: -15px; + margin-left: -15px; + } +} + +@media (min-width: 1200px) { + .row { + margin-right: -15px; + margin-left: -15px; + } } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { position: relative; min-height: 1px; + width: 100%; padding-right: 15px; padding-left: 15px; - width: 100%; +} + +@media (min-width: 544px) { + .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 768px) { + .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 992px) { + .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 1200px) { + .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + padding-right: 15px; + padding-left: 15px; + } } .col-xs { @@ -815,8 +870,6 @@ pre code { flex-grow: 1; max-width: 100%; min-height: 1px; - padding-right: 15px; - padding-left: 15px; } .col-xs-1 { @@ -1075,8 +1128,6 @@ pre code { flex-grow: 1; max-width: 100%; min-height: 1px; - padding-right: 15px; - padding-left: 15px; } .col-sm-1 { -webkit-box-flex: 0; @@ -1290,8 +1341,6 @@ pre code { flex-grow: 1; max-width: 100%; min-height: 1px; - padding-right: 15px; - padding-left: 15px; } .col-md-1 { -webkit-box-flex: 0; @@ -1505,8 +1554,6 @@ pre code { flex-grow: 1; max-width: 100%; min-height: 1px; - padding-right: 15px; - padding-left: 15px; } .col-lg-1 { -webkit-box-flex: 0; @@ -1720,8 +1767,6 @@ pre code { flex-grow: 1; max-width: 100%; min-height: 1px; - padding-right: 15px; - padding-left: 15px; } .col-xl-1 { -webkit-box-flex: 0; @@ -2315,6 +2360,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for } .form-check-inline.disabled { + color: #818a91; cursor: not-allowed; } @@ -2355,7 +2401,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for } .has-success .form-control-success { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%235cb85c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='$form-icon-success-color' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E"); } .has-warning .form-control-feedback, @@ -2381,7 +2427,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for } .has-warning .form-control-warning { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23f0ad4e' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#f0ad4e' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E"); } .has-danger .form-control-feedback, @@ -2407,7 +2453,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for } .has-danger .form-control-danger { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"); } @media (min-width: 544px) { @@ -3155,9 +3201,9 @@ input[type="button"].btn-block { z-index: 1000; display: none; float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; + min-width: 10rem; + padding: 0.5rem 0; + margin: 0.125rem 0 0; font-size: 1rem; color: #373a3c; text-align: left; @@ -3179,7 +3225,7 @@ input[type="button"].btn-block { .dropdown-item { display: block; width: 100%; - padding: 3px 20px; + padding: 3px 1.5rem; clear: both; font-weight: normal; color: #373a3c; @@ -3234,7 +3280,8 @@ input[type="button"].btn-block { .dropdown-header { display: block; - padding: 5px 20px; + padding: 0.5rem 1.5rem; + margin-bottom: 0; font-size: 0.875rem; color: #818a91; white-space: nowrap; @@ -3260,7 +3307,7 @@ input[type="button"].btn-block { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 2px; + margin-bottom: 0.125rem; } .btn-group, @@ -3274,6 +3321,7 @@ input[type="button"].btn-block { .btn-group-vertical > .btn { position: relative; float: left; + margin-bottom: 0; } .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, @@ -3657,12 +3705,12 @@ input[type="button"].btn-block { } .custom-checkbox .custom-control-input:checked ~ .custom-control-indicator { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"); } .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-indicator { background-color: #0074d9; - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#fff' d='M0 2h4'/%3E%3C/svg%3E"); } .custom-radio .custom-control-indicator { @@ -3670,7 +3718,7 @@ input[type="button"].btn-block { } .custom-radio .custom-control-input:checked ~ .custom-control-indicator { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#fff'/%3E%3C/svg%3E"); } .custom-controls-stacked .custom-control { @@ -3689,7 +3737,7 @@ input[type="button"].btn-block { padding-right: 0.75rem \9; color: #55595c; vertical-align: middle; - background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center; + background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center; background-image: none \9; -webkit-background-size: 8px 10px; background-size: 8px 10px; |
