1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-29 23:09:05 +02:00

Merge pull request #10680 from XhmikosR/master

Update normalize to v2.1.3.
This commit is contained in:
Chris Rebert
2013-09-18 09:38:14 -07:00
6 changed files with 98 additions and 153 deletions

View File

@@ -1,3 +1,10 @@
/*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default, .btn-default,
.btn-primary, .btn-primary,
.btn-success, .btn-success,

File diff suppressed because one or more lines are too long

204
dist/css/bootstrap.css vendored
View File

@@ -1,4 +1,11 @@
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ /*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
article, article,
aside, aside,
@@ -26,7 +33,8 @@ audio:not([controls]) {
height: 0; height: 0;
} }
[hidden] { [hidden],
template {
display: none; display: none;
} }
@@ -40,6 +48,10 @@ body {
margin: 0; margin: 0;
} }
a {
background: transparent;
}
a:focus { a:focus {
outline: thin dotted; outline: thin dotted;
} }
@@ -4489,7 +4501,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-collapse, .navbar-default .navbar-collapse,
.navbar-default .navbar-form { .navbar-default .navbar-form {
border-color: #e6e6e6; border-color: #e7e7e7;
} }
.navbar-default .navbar-nav > .dropdown > a:hover .caret, .navbar-default .navbar-nav > .dropdown > a:hover .caret,
@@ -6372,14 +6384,8 @@ body.modal-open,
visibility: hidden !important; visibility: hidden !important;
} }
.visible-xs { .visible-xs,
display: none !important; tr.visible-xs,
}
tr.visible-xs {
display: none !important;
}
th.visible-xs, th.visible-xs,
td.visible-xs { td.visible-xs {
display: none !important; display: none !important;
@@ -6437,14 +6443,8 @@ td.visible-xs {
} }
} }
.visible-sm { .visible-sm,
display: none !important; tr.visible-sm,
}
tr.visible-sm {
display: none !important;
}
th.visible-sm, th.visible-sm,
td.visible-sm { td.visible-sm {
display: none !important; display: none !important;
@@ -6502,14 +6502,8 @@ td.visible-sm {
} }
} }
.visible-md { .visible-md,
display: none !important; tr.visible-md,
}
tr.visible-md {
display: none !important;
}
th.visible-md, th.visible-md,
td.visible-md { td.visible-md {
display: none !important; display: none !important;
@@ -6567,14 +6561,8 @@ td.visible-md {
} }
} }
.visible-lg { .visible-lg,
display: none !important; tr.visible-lg,
}
tr.visible-lg {
display: none !important;
}
th.visible-lg, th.visible-lg,
td.visible-lg { td.visible-lg {
display: none !important; display: none !important;
@@ -6646,12 +6634,8 @@ td.hidden-xs {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.hidden-xs { .hidden-xs,
display: none !important; tr.hidden-xs,
}
tr.hidden-xs {
display: none !important;
}
th.hidden-xs, th.hidden-xs,
td.hidden-xs { td.hidden-xs {
display: none !important; display: none !important;
@@ -6659,12 +6643,8 @@ td.hidden-xs {
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.hidden-xs.hidden-sm { .hidden-xs.hidden-sm,
display: none !important; tr.hidden-xs.hidden-sm,
}
tr.hidden-xs.hidden-sm {
display: none !important;
}
th.hidden-xs.hidden-sm, th.hidden-xs.hidden-sm,
td.hidden-xs.hidden-sm { td.hidden-xs.hidden-sm {
display: none !important; display: none !important;
@@ -6672,12 +6652,8 @@ td.hidden-xs {
} }
@media (min-width: 992px) and (max-width: 1199px) { @media (min-width: 992px) and (max-width: 1199px) {
.hidden-xs.hidden-md { .hidden-xs.hidden-md,
display: none !important; tr.hidden-xs.hidden-md,
}
tr.hidden-xs.hidden-md {
display: none !important;
}
th.hidden-xs.hidden-md, th.hidden-xs.hidden-md,
td.hidden-xs.hidden-md { td.hidden-xs.hidden-md {
display: none !important; display: none !important;
@@ -6685,12 +6661,8 @@ td.hidden-xs {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.hidden-xs.hidden-lg { .hidden-xs.hidden-lg,
display: none !important; tr.hidden-xs.hidden-lg,
}
tr.hidden-xs.hidden-lg {
display: none !important;
}
th.hidden-xs.hidden-lg, th.hidden-xs.hidden-lg,
td.hidden-xs.hidden-lg { td.hidden-xs.hidden-lg {
display: none !important; display: none !important;
@@ -6711,12 +6683,8 @@ td.hidden-sm {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.hidden-sm.hidden-xs { .hidden-sm.hidden-xs,
display: none !important; tr.hidden-sm.hidden-xs,
}
tr.hidden-sm.hidden-xs {
display: none !important;
}
th.hidden-sm.hidden-xs, th.hidden-sm.hidden-xs,
td.hidden-sm.hidden-xs { td.hidden-sm.hidden-xs {
display: none !important; display: none !important;
@@ -6724,12 +6692,8 @@ td.hidden-sm {
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.hidden-sm { .hidden-sm,
display: none !important; tr.hidden-sm,
}
tr.hidden-sm {
display: none !important;
}
th.hidden-sm, th.hidden-sm,
td.hidden-sm { td.hidden-sm {
display: none !important; display: none !important;
@@ -6737,12 +6701,8 @@ td.hidden-sm {
} }
@media (min-width: 992px) and (max-width: 1199px) { @media (min-width: 992px) and (max-width: 1199px) {
.hidden-sm.hidden-md { .hidden-sm.hidden-md,
display: none !important; tr.hidden-sm.hidden-md,
}
tr.hidden-sm.hidden-md {
display: none !important;
}
th.hidden-sm.hidden-md, th.hidden-sm.hidden-md,
td.hidden-sm.hidden-md { td.hidden-sm.hidden-md {
display: none !important; display: none !important;
@@ -6750,12 +6710,8 @@ td.hidden-sm {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.hidden-sm.hidden-lg { .hidden-sm.hidden-lg,
display: none !important; tr.hidden-sm.hidden-lg,
}
tr.hidden-sm.hidden-lg {
display: none !important;
}
th.hidden-sm.hidden-lg, th.hidden-sm.hidden-lg,
td.hidden-sm.hidden-lg { td.hidden-sm.hidden-lg {
display: none !important; display: none !important;
@@ -6776,12 +6732,8 @@ td.hidden-md {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.hidden-md.hidden-xs { .hidden-md.hidden-xs,
display: none !important; tr.hidden-md.hidden-xs,
}
tr.hidden-md.hidden-xs {
display: none !important;
}
th.hidden-md.hidden-xs, th.hidden-md.hidden-xs,
td.hidden-md.hidden-xs { td.hidden-md.hidden-xs {
display: none !important; display: none !important;
@@ -6789,12 +6741,8 @@ td.hidden-md {
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.hidden-md.hidden-sm { .hidden-md.hidden-sm,
display: none !important; tr.hidden-md.hidden-sm,
}
tr.hidden-md.hidden-sm {
display: none !important;
}
th.hidden-md.hidden-sm, th.hidden-md.hidden-sm,
td.hidden-md.hidden-sm { td.hidden-md.hidden-sm {
display: none !important; display: none !important;
@@ -6802,12 +6750,8 @@ td.hidden-md {
} }
@media (min-width: 992px) and (max-width: 1199px) { @media (min-width: 992px) and (max-width: 1199px) {
.hidden-md { .hidden-md,
display: none !important; tr.hidden-md,
}
tr.hidden-md {
display: none !important;
}
th.hidden-md, th.hidden-md,
td.hidden-md { td.hidden-md {
display: none !important; display: none !important;
@@ -6815,12 +6759,8 @@ td.hidden-md {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.hidden-md.hidden-lg { .hidden-md.hidden-lg,
display: none !important; tr.hidden-md.hidden-lg,
}
tr.hidden-md.hidden-lg {
display: none !important;
}
th.hidden-md.hidden-lg, th.hidden-md.hidden-lg,
td.hidden-md.hidden-lg { td.hidden-md.hidden-lg {
display: none !important; display: none !important;
@@ -6841,12 +6781,8 @@ td.hidden-lg {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.hidden-lg.hidden-xs { .hidden-lg.hidden-xs,
display: none !important; tr.hidden-lg.hidden-xs,
}
tr.hidden-lg.hidden-xs {
display: none !important;
}
th.hidden-lg.hidden-xs, th.hidden-lg.hidden-xs,
td.hidden-lg.hidden-xs { td.hidden-lg.hidden-xs {
display: none !important; display: none !important;
@@ -6854,12 +6790,8 @@ td.hidden-lg {
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.hidden-lg.hidden-sm { .hidden-lg.hidden-sm,
display: none !important; tr.hidden-lg.hidden-sm,
}
tr.hidden-lg.hidden-sm {
display: none !important;
}
th.hidden-lg.hidden-sm, th.hidden-lg.hidden-sm,
td.hidden-lg.hidden-sm { td.hidden-lg.hidden-sm {
display: none !important; display: none !important;
@@ -6867,12 +6799,8 @@ td.hidden-lg {
} }
@media (min-width: 992px) and (max-width: 1199px) { @media (min-width: 992px) and (max-width: 1199px) {
.hidden-lg.hidden-md { .hidden-lg.hidden-md,
display: none !important; tr.hidden-lg.hidden-md,
}
tr.hidden-lg.hidden-md {
display: none !important;
}
th.hidden-lg.hidden-md, th.hidden-lg.hidden-md,
td.hidden-lg.hidden-md { td.hidden-lg.hidden-md {
display: none !important; display: none !important;
@@ -6880,26 +6808,16 @@ td.hidden-lg {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.hidden-lg { .hidden-lg,
display: none !important; tr.hidden-lg,
}
tr.hidden-lg {
display: none !important;
}
th.hidden-lg, th.hidden-lg,
td.hidden-lg { td.hidden-lg {
display: none !important; display: none !important;
} }
} }
.visible-print { .visible-print,
display: none !important; tr.visible-print,
}
tr.visible-print {
display: none !important;
}
th.visible-print, th.visible-print,
td.visible-print { td.visible-print {
display: none !important; display: none !important;
@@ -6916,12 +6834,8 @@ td.visible-print {
td.visible-print { td.visible-print {
display: table-cell !important; display: table-cell !important;
} }
.hidden-print { .hidden-print,
display: none !important; tr.hidden-print,
}
tr.hidden-print {
display: none !important;
}
th.hidden-print, th.hidden-print,
td.hidden-print { td.hidden-print {
display: none !important; display: none !important;

File diff suppressed because one or more lines are too long

View File

@@ -559,7 +559,7 @@
} }
.responsive-invisibility() { .responsive-invisibility() {
&, &,
tr&, tr&,
th&, th&,
td& { display: none !important; } td& { display: none !important; }

22
less/normalize.less vendored
View File

@@ -1,4 +1,4 @@
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */
// ========================================================================== // ==========================================================================
// HTML5 display definitions // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
} }
// //
// Address styling not present in IE 8/9. // Address `[hidden]` styling not present in IE 8/9.
// Hide the `template` element in IE, Safari, and Firefox < 22.
// //
[hidden] { [hidden],
template {
display: none; display: none;
} }
@@ -63,8 +65,8 @@ audio:not([controls]) {
html { html {
font-family: sans-serif; // 1 font-family: sans-serif; // 1
-webkit-text-size-adjust: 100%; // 2
-ms-text-size-adjust: 100%; // 2 -ms-text-size-adjust: 100%; // 2
-webkit-text-size-adjust: 100%; // 2
} }
// //
@@ -79,6 +81,14 @@ body {
// Links // Links
// ========================================================================== // ==========================================================================
//
// Remove the gray background color from active links in IE 10.
//
a {
background: transparent;
}
// //
// Address `outline` inconsistency between Chrome and other browsers. // Address `outline` inconsistency between Chrome and other browsers.
// //
@@ -329,8 +339,8 @@ html input[disabled] {
} }
// //
// 1. Address box sizing set to `content-box` in IE 8/9. // 1. Address box sizing set to `content-box` in IE 8/9/10.
// 2. Remove excess padding in IE 8/9. // 2. Remove excess padding in IE 8/9/10.
// //
input[type="checkbox"], input[type="checkbox"],