0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
This commit is contained in:
Mark Otto 2014-12-11 12:06:08 -08:00
parent fef873a840
commit 2a78159a20
8 changed files with 164 additions and 190 deletions

View File

@ -192,7 +192,6 @@ td, th {
padding: 0; padding: 0;
} }
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
@media print { @media print {
*, *:before, *:after { *, *:before, *:after {
color: #000 !important; color: #000 !important;
@ -536,7 +535,7 @@ blockquote footer {
color: #818a91; color: #818a91;
} }
blockquote footer:before { blockquote footer:before {
content: '\2014 \00A0'; content: "\2014 \00A0";
} }
.blockquote-reverse { .blockquote-reverse {
@ -547,10 +546,10 @@ blockquote footer:before {
border-left: 0; border-left: 0;
} }
.blockquote-reverse footer:before { .blockquote-reverse footer:before {
content: ''; content: "";
} }
.blockquote-reverse footer:after { .blockquote-reverse footer:after {
content: '\00A0 \2014'; content: "\00A0 \2014";
} }
address { address {
@ -2642,9 +2641,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
position: relative; position: relative;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
-webkit-transition: height .35s ease;
-o-transition: height .35s ease;
transition: height .35s ease;
-webkit-transition-timing-function: ease; -webkit-transition-timing-function: ease;
-o-transition-timing-function: ease; -o-transition-timing-function: ease;
transition-timing-function: ease; transition-timing-function: ease;
@ -3166,9 +3162,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.navbar { .navbar {
position: relative; position: relative;
padding: 1rem; padding: 1rem;
/*min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)*/
margin-bottom: 1; margin-bottom: 1;
/*border: 1px solid transparent;*/
} }
.navbar:before, .navbar:after { .navbar:before, .navbar:after {
display: table; display: table;
@ -3223,7 +3217,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
margin-bottom: 0; margin-bottom: 0;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1; line-height: 1;
/*height: $navbar-height;*/
} }
.navbar-brand > a:hover, .navbar-brand > a:focus { .navbar-brand > a:hover, .navbar-brand > a:focus {
text-decoration: none; text-decoration: none;
@ -3630,7 +3623,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.card-columns .card { .card-columns .card {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
/*margin-bottom: 1rem;*/
} }
.breadcrumb { .breadcrumb {
@ -3984,7 +3976,6 @@ a.badge:hover, a.badge:focus {
color: #843534; color: #843534;
} }
/*csslint empty-rules: false, important: true*/
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { from {
background-position: 1 0; background-position: 1 0;
@ -4434,14 +4425,10 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
outline: 0; outline: 0;
} }
.modal.fade .modal-dialog { .modal.fade .modal-dialog {
-webkit-transform: translate(0, -25%); -webkit-transform: transition .3s ease-out, translate(0, -25%);
-webkit-transform: transition .3s ease-out; -ms-transform: transition .3s ease-out, translate(0, -25%);
-ms-transform: translate(0, -25%); -o-transform: transition .3s ease-out, translate(0, -25%);
-ms-transform: transition .3s ease-out; transform: transition .3s ease-out, translate(0, -25%);
-o-transform: translate(0, -25%);
-o-transform: transition .3s ease-out;
transform: translate(0, -25%);
transform: transition .3s ease-out;
} }
.modal.in .modal-dialog { .modal.in .modal-dialog {
-webkit-transform: translate(0, 0); -webkit-transform: translate(0, 0);
@ -4742,7 +4729,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.top > .arrow:after { .popover.top > .arrow:after {
bottom: 1px; bottom: 1px;
margin-left: -10px; margin-left: -10px;
content: " "; content: "";
border-top-color: #fff; border-top-color: #fff;
border-bottom-width: 0; border-bottom-width: 0;
} }
@ -4756,7 +4743,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.right > .arrow:after { .popover.right > .arrow:after {
bottom: -10px; bottom: -10px;
left: 1px; left: 1px;
content: " "; content: "";
border-right-color: #fff; border-right-color: #fff;
border-left-width: 0; border-left-width: 0;
} }
@ -4770,7 +4757,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.bottom > .arrow:after { .popover.bottom > .arrow:after {
top: 1px; top: 1px;
margin-left: -10px; margin-left: -10px;
content: " "; content: "";
border-top-width: 0; border-top-width: 0;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
@ -4784,7 +4771,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.left > .arrow:after { .popover.left > .arrow:after {
right: 1px; right: 1px;
bottom: -10px; bottom: -10px;
content: " "; content: "";
border-right-width: 0; border-right-width: 0;
border-left-color: #fff; border-left-color: #fff;
} }
@ -4918,10 +4905,10 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
margin-right: -10px; margin-right: -10px;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev:before {
content: '\2039'; content: "\2039";
} }
.carousel-control .icon-next:before { .carousel-control .icon-next:before {
content: '\203a'; content: "\203a";
} }
.carousel-indicators { .carousel-indicators {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -192,7 +192,6 @@ td, th {
padding: 0; padding: 0;
} }
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
@media print { @media print {
*, *:before, *:after { *, *:before, *:after {
color: #000 !important; color: #000 !important;
@ -536,7 +535,7 @@ blockquote footer {
color: #818a91; color: #818a91;
} }
blockquote footer:before { blockquote footer:before {
content: '\2014 \00A0'; content: "\2014 \00A0";
} }
.blockquote-reverse { .blockquote-reverse {
@ -547,10 +546,10 @@ blockquote footer:before {
border-left: 0; border-left: 0;
} }
.blockquote-reverse footer:before { .blockquote-reverse footer:before {
content: ''; content: "";
} }
.blockquote-reverse footer:after { .blockquote-reverse footer:after {
content: '\00A0 \2014'; content: "\00A0 \2014";
} }
address { address {
@ -2642,9 +2641,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
position: relative; position: relative;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
-webkit-transition: height .35s ease;
-o-transition: height .35s ease;
transition: height .35s ease;
-webkit-transition-timing-function: ease; -webkit-transition-timing-function: ease;
-o-transition-timing-function: ease; -o-transition-timing-function: ease;
transition-timing-function: ease; transition-timing-function: ease;
@ -3166,9 +3162,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.navbar { .navbar {
position: relative; position: relative;
padding: 1rem; padding: 1rem;
/*min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)*/
margin-bottom: 1; margin-bottom: 1;
/*border: 1px solid transparent;*/
} }
.navbar:before, .navbar:after { .navbar:before, .navbar:after {
display: table; display: table;
@ -3223,7 +3217,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
margin-bottom: 0; margin-bottom: 0;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1; line-height: 1;
/*height: $navbar-height;*/
} }
.navbar-brand > a:hover, .navbar-brand > a:focus { .navbar-brand > a:hover, .navbar-brand > a:focus {
text-decoration: none; text-decoration: none;
@ -3630,7 +3623,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.card-columns .card { .card-columns .card {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
/*margin-bottom: 1rem;*/
} }
.breadcrumb { .breadcrumb {
@ -3984,7 +3976,6 @@ a.badge:hover, a.badge:focus {
color: #843534; color: #843534;
} }
/*csslint empty-rules: false, important: true*/
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { from {
background-position: 1 0; background-position: 1 0;
@ -4434,14 +4425,10 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
outline: 0; outline: 0;
} }
.modal.fade .modal-dialog { .modal.fade .modal-dialog {
-webkit-transform: translate(0, -25%); -webkit-transform: transition .3s ease-out, translate(0, -25%);
-webkit-transform: transition .3s ease-out; -ms-transform: transition .3s ease-out, translate(0, -25%);
-ms-transform: translate(0, -25%); -o-transform: transition .3s ease-out, translate(0, -25%);
-ms-transform: transition .3s ease-out; transform: transition .3s ease-out, translate(0, -25%);
-o-transform: translate(0, -25%);
-o-transform: transition .3s ease-out;
transform: translate(0, -25%);
transform: transition .3s ease-out;
} }
.modal.in .modal-dialog { .modal.in .modal-dialog {
-webkit-transform: translate(0, 0); -webkit-transform: translate(0, 0);
@ -4742,7 +4729,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.top > .arrow:after { .popover.top > .arrow:after {
bottom: 1px; bottom: 1px;
margin-left: -10px; margin-left: -10px;
content: " "; content: "";
border-top-color: #fff; border-top-color: #fff;
border-bottom-width: 0; border-bottom-width: 0;
} }
@ -4756,7 +4743,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.right > .arrow:after { .popover.right > .arrow:after {
bottom: -10px; bottom: -10px;
left: 1px; left: 1px;
content: " "; content: "";
border-right-color: #fff; border-right-color: #fff;
border-left-width: 0; border-left-width: 0;
} }
@ -4770,7 +4757,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.bottom > .arrow:after { .popover.bottom > .arrow:after {
top: 1px; top: 1px;
margin-left: -10px; margin-left: -10px;
content: " "; content: "";
border-top-width: 0; border-top-width: 0;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
@ -4784,7 +4771,7 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
.popover.left > .arrow:after { .popover.left > .arrow:after {
right: 1px; right: 1px;
bottom: -10px; bottom: -10px;
content: " "; content: "";
border-right-width: 0; border-right-width: 0;
border-left-color: #fff; border-left-color: #fff;
} }
@ -4918,10 +4905,10 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
margin-right: -10px; margin-right: -10px;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev:before {
content: '\2039'; content: "\2039";
} }
.carousel-control .icon-next:before { .carousel-control .icon-next:before {
content: '\203a'; content: "\203a";
} }
.carousel-indicators { .carousel-indicators {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long