0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

rems: rework grid system vars to use rems/ems

This commit is contained in:
Mark Otto 2014-07-08 03:14:27 -07:00
parent a06a35d27a
commit 9f53f9aea1
7 changed files with 186 additions and 186 deletions

172
dist/css/bootstrap.css vendored
View File

@ -619,7 +619,7 @@ dt {
dd {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.dl-horizontal dt {
float: left;
width: 160px;
@ -749,41 +749,41 @@ pre code {
overflow-y: scroll;
}
.container {
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
margin-right: auto;
margin-left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.container {
width: 720px;
width: 45rem;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.container {
width: 940px;
width: 60rem;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.container {
width: 1140px;
width: 72.25rem;
}
}
.container-fluid {
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
margin-right: auto;
margin-left: auto;
}
.row {
margin-right: -15px;
margin-left: -15px;
margin-right: -.75rem;
margin-left: -.75rem;
}
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
position: relative;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
}
.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 {
float: left;
@ -941,7 +941,7 @@ pre code {
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.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 {
float: left;
}
@ -1099,7 +1099,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.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 {
float: left;
}
@ -1257,7 +1257,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.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 {
float: left;
}
@ -1600,7 +1600,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc;
}
@media screen and (max-width: 767px) {
@media screen and (max-width: 47.9em) {
.table-responsive {
width: 100%;
margin-bottom: 18px;
@ -2017,7 +2017,7 @@ select[multiple].form-group-lg .form-control {
margin-bottom: 10px;
color: #747a7f;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-inline .form-group {
display: inline-block;
margin-bottom: 0;
@ -2077,10 +2077,10 @@ select[multiple].form-group-lg .form-control {
min-height: 25.5px;
}
.form-horizontal .form-group {
margin-right: -15px;
margin-left: -15px;
margin-right: -.75rem;
margin-left: -.75rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .control-label {
padding-top: 1.5rem;
margin-bottom: 0;
@ -2088,14 +2088,14 @@ select[multiple].form-group-lg .form-control {
}
}
.form-horizontal .has-feedback .form-control-feedback {
right: 15px;
right: .75rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .form-group-lg .control-label {
padding-top: 1.9975rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .form-group-sm .control-label {
padding-top: 1.3rem;
}
@ -2643,7 +2643,7 @@ tbody.collapse.in {
bottom: 100%;
margin-bottom: 1px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-right .dropdown-menu {
right: 0;
left: auto;
@ -3064,7 +3064,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs.nav-justified > li {
display: table-cell;
width: 1%;
@ -3082,7 +3082,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: .2rem .2rem 0 0;
@ -3129,7 +3129,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-justified > li {
display: table-cell;
width: 1%;
@ -3150,7 +3150,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: .2rem .2rem 0 0;
@ -3178,19 +3178,19 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-bottom: 24px;
border: 1px solid transparent;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar {
border-radius: .2rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-header {
float: left;
}
}
.navbar-collapse {
padding-right: 15px;
padding-left: 15px;
padding-right: 0rem;
padding-left: 0rem;
overflow-x: visible;
-webkit-overflow-scrolling: touch;
border-top: 1px solid transparent;
@ -3200,7 +3200,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-collapse.in {
overflow-y: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-collapse {
width: auto;
border-top: 0;
@ -3237,10 +3237,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: -15px;
margin-left: -15px;
margin-right: -0rem;
margin-left: -0rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.container > .navbar-header,
.container-fluid > .navbar-header,
.container > .navbar-collapse,
@ -3253,7 +3253,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
z-index: 1000;
border-width: 0 0 1px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-static-top {
border-radius: 0;
}
@ -3267,7 +3267,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
@ -3285,7 +3285,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand {
float: left;
height: 50px;
padding: 13px 15px;
padding: 13px 0rem;
font-size: 1.25rem;
line-height: 24px;
}
@ -3296,10 +3296,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand > img {
display: block;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px;
margin-left: -0rem;
}
}
.navbar-toggle {
@ -3307,7 +3307,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
padding: 9px 10px;
margin-top: 8px;
margin-right: 15px;
margin-right: 0rem;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
@ -3326,20 +3326,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-toggle .icon-bar + .icon-bar {
margin-top: 4px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-toggle {
display: none;
}
}
.navbar-nav {
margin: 6.5px -15px;
margin: 6.5px -0rem;
}
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
line-height: 24px;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-nav .open .dropdown-menu {
position: static;
float: none;
@ -3362,7 +3362,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
background-image: none;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-nav {
float: left;
margin: 0;
@ -3376,17 +3376,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-form {
padding: 10px 15px;
padding: 10px 0rem;
margin-top: 23.65px;
margin-right: -15px;
margin-right: -0rem;
margin-bottom: 23.65px;
margin-left: -15px;
margin-left: -0rem;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-form .form-group {
display: inline-block;
margin-bottom: 0;
@ -3433,12 +3433,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: 0;
}
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-form .form-group {
margin-bottom: 5px;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-form {
width: auto;
padding-top: 0;
@ -3475,20 +3475,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-top: 13px;
margin-bottom: 13px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-text {
float: left;
margin-right: 15px;
margin-left: 15px;
margin-right: 0rem;
margin-left: 0rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-left {
float: left !important;
}
.navbar-right {
float: right !important;
margin-right: -15px;
margin-right: -0rem;
}
.navbar-right ~ .navbar-right {
margin-right: 0;
@ -3549,7 +3549,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
color: #555;
background-color: #e7e7e7;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #777;
}
@ -3645,7 +3645,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
color: #fff;
background-color: #080808;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
}
@ -3971,7 +3971,7 @@ a.list-group-item.active > .badge,
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 48em) {
.jumbotron {
padding-top: 48px;
padding-bottom: 48px;
@ -4849,7 +4849,7 @@ button.close {
height: 50px;
overflow: scroll;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.modal-dialog {
width: 600px;
margin: 30px auto;
@ -4862,7 +4862,7 @@ button.close {
width: 300px;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.modal-lg {
width: 900px;
}
@ -5240,7 +5240,7 @@ button.close {
.carousel-caption .btn {
text-shadow: none;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 48em) {
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
@ -5372,7 +5372,7 @@ button.close {
.visible-lg-inline-block {
display: none !important;
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs {
display: block !important;
}
@ -5387,22 +5387,22 @@ button.close {
display: table-cell !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-block {
display: block !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-inline {
display: inline !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-inline-block {
display: inline-block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm {
display: block !important;
}
@ -5417,22 +5417,22 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-block {
display: block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-inline {
display: inline !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-inline-block {
display: inline-block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md {
display: block !important;
}
@ -5447,22 +5447,22 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-block {
display: block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-inline {
display: inline !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-inline-block {
display: inline-block !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg {
display: block !important;
}
@ -5477,37 +5477,37 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-block {
display: block !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-inline {
display: inline !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-inline-block {
display: inline-block !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.hidden-xs {
display: none !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.hidden-sm {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.hidden-md {
display: none !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.hidden-lg {
display: none !important;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -619,7 +619,7 @@ dt {
dd {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.dl-horizontal dt {
float: left;
width: 160px;
@ -749,41 +749,41 @@ pre code {
overflow-y: scroll;
}
.container {
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
margin-right: auto;
margin-left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.container {
width: 720px;
width: 45rem;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.container {
width: 940px;
width: 60rem;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.container {
width: 1140px;
width: 72.25rem;
}
}
.container-fluid {
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
margin-right: auto;
margin-left: auto;
}
.row {
margin-right: -15px;
margin-left: -15px;
margin-right: -.75rem;
margin-left: -.75rem;
}
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
position: relative;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
padding-right: .75rem;
padding-left: .75rem;
}
.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 {
float: left;
@ -941,7 +941,7 @@ pre code {
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.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 {
float: left;
}
@ -1099,7 +1099,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.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 {
float: left;
}
@ -1257,7 +1257,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.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 {
float: left;
}
@ -1600,7 +1600,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc;
}
@media screen and (max-width: 767px) {
@media screen and (max-width: 47.9em) {
.table-responsive {
width: 100%;
margin-bottom: 18px;
@ -2017,7 +2017,7 @@ select[multiple].form-group-lg .form-control {
margin-bottom: 10px;
color: #747a7f;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-inline .form-group {
display: inline-block;
margin-bottom: 0;
@ -2077,10 +2077,10 @@ select[multiple].form-group-lg .form-control {
min-height: 25.5px;
}
.form-horizontal .form-group {
margin-right: -15px;
margin-left: -15px;
margin-right: -.75rem;
margin-left: -.75rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .control-label {
padding-top: 1.5rem;
margin-bottom: 0;
@ -2088,14 +2088,14 @@ select[multiple].form-group-lg .form-control {
}
}
.form-horizontal .has-feedback .form-control-feedback {
right: 15px;
right: .75rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .form-group-lg .control-label {
padding-top: 1.9975rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.form-horizontal .form-group-sm .control-label {
padding-top: 1.3rem;
}
@ -2643,7 +2643,7 @@ tbody.collapse.in {
bottom: 100%;
margin-bottom: 1px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-right .dropdown-menu {
right: 0;
left: auto;
@ -3064,7 +3064,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs.nav-justified > li {
display: table-cell;
width: 1%;
@ -3082,7 +3082,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: .2rem .2rem 0 0;
@ -3129,7 +3129,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-justified > li {
display: table-cell;
width: 1%;
@ -3150,7 +3150,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.nav-tabs-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: .2rem .2rem 0 0;
@ -3178,19 +3178,19 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-bottom: 24px;
border: 1px solid transparent;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar {
border-radius: .2rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-header {
float: left;
}
}
.navbar-collapse {
padding-right: 15px;
padding-left: 15px;
padding-right: 0rem;
padding-left: 0rem;
overflow-x: visible;
-webkit-overflow-scrolling: touch;
border-top: 1px solid transparent;
@ -3200,7 +3200,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-collapse.in {
overflow-y: auto;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-collapse {
width: auto;
border-top: 0;
@ -3237,10 +3237,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: -15px;
margin-left: -15px;
margin-right: -0rem;
margin-left: -0rem;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.container > .navbar-header,
.container-fluid > .navbar-header,
.container > .navbar-collapse,
@ -3253,7 +3253,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
z-index: 1000;
border-width: 0 0 1px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-static-top {
border-radius: 0;
}
@ -3267,7 +3267,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
@ -3285,7 +3285,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand {
float: left;
height: 50px;
padding: 13px 15px;
padding: 13px 0rem;
font-size: 1.25rem;
line-height: 24px;
}
@ -3296,10 +3296,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand > img {
display: block;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px;
margin-left: -0rem;
}
}
.navbar-toggle {
@ -3307,7 +3307,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
padding: 9px 10px;
margin-top: 8px;
margin-right: 15px;
margin-right: 0rem;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
@ -3326,20 +3326,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-toggle .icon-bar + .icon-bar {
margin-top: 4px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-toggle {
display: none;
}
}
.navbar-nav {
margin: 6.5px -15px;
margin: 6.5px -0rem;
}
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
line-height: 24px;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-nav .open .dropdown-menu {
position: static;
float: none;
@ -3362,7 +3362,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
background-image: none;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-nav {
float: left;
margin: 0;
@ -3376,17 +3376,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-form {
padding: 10px 15px;
padding: 10px 0rem;
margin-top: 23.65px;
margin-right: -15px;
margin-right: -0rem;
margin-bottom: 23.65px;
margin-left: -15px;
margin-left: -0rem;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-form .form-group {
display: inline-block;
margin-bottom: 0;
@ -3433,12 +3433,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: 0;
}
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-form .form-group {
margin-bottom: 5px;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-form {
width: auto;
padding-top: 0;
@ -3475,20 +3475,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-top: 13px;
margin-bottom: 13px;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-text {
float: left;
margin-right: 15px;
margin-left: 15px;
margin-right: 0rem;
margin-left: 0rem;
}
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.navbar-left {
float: left !important;
}
.navbar-right {
float: right !important;
margin-right: -15px;
margin-right: -0rem;
}
.navbar-right ~ .navbar-right {
margin-right: 0;
@ -3549,7 +3549,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
color: #555;
background-color: #e7e7e7;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #777;
}
@ -3645,7 +3645,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
color: #fff;
background-color: #080808;
}
@media (max-width: 767px) {
@media (max-width: 47em) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
}
@ -3971,7 +3971,7 @@ a.list-group-item.active > .badge,
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 48em) {
.jumbotron {
padding-top: 48px;
padding-bottom: 48px;
@ -4849,7 +4849,7 @@ button.close {
height: 50px;
overflow: scroll;
}
@media (min-width: 768px) {
@media (min-width: 48em) {
.modal-dialog {
width: 600px;
margin: 30px auto;
@ -4862,7 +4862,7 @@ button.close {
width: 300px;
}
}
@media (min-width: 992px) {
@media (min-width: 62em) {
.modal-lg {
width: 900px;
}
@ -5240,7 +5240,7 @@ button.close {
.carousel-caption .btn {
text-shadow: none;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 48em) {
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
@ -5372,7 +5372,7 @@ button.close {
.visible-lg-inline-block {
display: none !important;
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs {
display: block !important;
}
@ -5387,22 +5387,22 @@ button.close {
display: table-cell !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-block {
display: block !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-inline {
display: inline !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.visible-xs-inline-block {
display: inline-block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm {
display: block !important;
}
@ -5417,22 +5417,22 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-block {
display: block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-inline {
display: inline !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.visible-sm-inline-block {
display: inline-block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md {
display: block !important;
}
@ -5447,22 +5447,22 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-block {
display: block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-inline {
display: inline !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.visible-md-inline-block {
display: inline-block !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg {
display: block !important;
}
@ -5477,37 +5477,37 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-block {
display: block !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-inline {
display: inline !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.visible-lg-inline-block {
display: inline-block !important;
}
}
@media (max-width: 767px) {
@media (max-width: 47.9em) {
.hidden-xs {
display: none !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 48em) and (max-width: 61.9em) {
.hidden-sm {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 62em) and (max-width: 74.9em) {
.hidden-md {
display: none !important;
}
}
@media (min-width: 1200px) {
@media (min-width: 75em) {
.hidden-lg {
display: none !important;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -250,18 +250,18 @@
//## Define the minimum and maximum dimensions at which your layout will change, adapting to different screen sizes.
// Extra small screen / phone
@screen-xs-max: (@screen-sm-min - 1);
@screen-xs-max: (@screen-sm-min - .1);
// Small screen / tablet
@screen-sm-min: 768px;
@screen-sm-max: (@screen-md-min - 1);
@screen-sm-min: 48em;
@screen-sm-max: (@screen-md-min - .1);
// Medium screen / desktop
@screen-md-min: 992px;
@screen-md-max: (@screen-lg-min - 1);
@screen-md-min: 62em;
@screen-md-max: (@screen-lg-min - .1);
// Large screen / wide desktop
@screen-lg-min: 1200px;
@screen-lg-min: 75em;
//== Grid system
@ -271,7 +271,7 @@
//** Number of columns in the grid.
@grid-columns: 12;
//** Padding between columns. Gets divided in half for the left and right.
@grid-gutter-width: 30px;
@grid-gutter-width: 1.5rem;
// Navbar collapse
//** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: @screen-sm-min;
@ -284,13 +284,13 @@
//## Define the maximum width of `.container` for different screen sizes.
//** For `@screen-sm-min` and up.
@container-sm: 720px;
@container-sm: 45rem; // 720
//** For `@screen-md-min` and up.
@container-md: 940px;
@container-md: 60rem; // 960
//** For `@screen-lg-min` and up.
@container-lg: 1140px;
@container-lg: 72.25rem; // 1140
//== Navbar