rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

grunt

Browse Source
This commit is contained in:
Mark Otto 2014-12-18 20:19:53 -08:00
parent 41226bd91e
commit 94753bc3ec
11 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dist/css/bootstrap.css vendored
View File

@ -312,7 +312,7 @@ img {
vertical-align: middle; vertical-align: middle;
} }
.img-responsive, .carousel-inner > .item > img, .carousel-inner > .item > a > img { .img-responsive, .carousel-inner > .carousel-item > img, .carousel-inner > .carousel-item > a > img {
display: block; display: block;
max-width: 100%; max-width: 100%;
height: auto; height: auto;
@ -3672,18 +3672,20 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
text-decoration: none; text-decoration: none;
background-color: #eceeef; background-color: #eceeef;
} }
.pager .next > a, .pager .next > span {
float: right;
}
.pager .previous > a, .pager .previous > span {
float: left;
}
.pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span {
color: #818a91; color: #818a91;
cursor: not-allowed; cursor: not-allowed;
background-color: #fff; background-color: #fff;
} }
.pager-next > a, .pager-next > span {
float: right;
}
.pager-prev > a, .pager-prev > span {
float: left;
}
.label { .label {
display: inline-block; display: inline-block;
padding: .25em .4em; padding: .25em .4em;
@ -4708,18 +4710,18 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.carousel-inner > .item { .carousel-inner > .carousel-item {
position: relative; position: relative;
display: none; display: none;
-webkit-transition: .6s ease-in-out left; -webkit-transition: .6s ease-in-out left;
-o-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left;
transition: .6s ease-in-out left; transition: .6s ease-in-out left;
} }
.carousel-inner > .item > img, .carousel-inner > .item > a > img { .carousel-inner > .carousel-item > img, .carousel-inner > .carousel-item > a > img {
line-height: 1; line-height: 1;
} }
@media all and (transform-3d), (-webkit-transform-3d) { @media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item { .carousel-inner > .carousel-item {
-webkit-transition: -webkit-transform .6s ease-in-out; -webkit-transition: -webkit-transform .6s ease-in-out;
-o-transition: -o-transform .6s ease-in-out; -o-transition: -o-transform .6s ease-in-out;
transition: transform .6s ease-in-out; transition: transform .6s ease-in-out;
@ -4729,17 +4731,17 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
-webkit-perspective: 1000; -webkit-perspective: 1000;
perspective: 1000; perspective: 1000;
} }
.carousel-inner > .item.next, .carousel-inner > .item.active.right { .carousel-inner > .carousel-item.next, .carousel-inner > .carousel-item.active.right {
left: 0; left: 0;
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
} }
.carousel-inner > .item.prev, .carousel-inner > .item.active.left { .carousel-inner > .carousel-item.prev, .carousel-inner > .carousel-item.active.left {
left: 0; left: 0;
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
} }
.carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { .carousel-inner > .carousel-item.next.left, .carousel-inner > .carousel-item.prev.right, .carousel-inner > .carousel-item.active {
left: 0; left: 0;
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
dist/js/bootstrap.js vendored
View File

@ -354,7 +354,7 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.getItemIndex = function (item) { Carousel.prototype.getItemIndex = function (item) {
this.$items = item.parent().children('.item') this.$items = item.parent().children('.carousel-item')
return this.$items.index(item || this.$active) return this.$items.index(item || this.$active)
} }
@ -370,7 +370,7 @@ if (typeof jQuery === 'undefined') {
Carousel.prototype.to = function (pos) { Carousel.prototype.to = function (pos) {
var that = this var that = this
var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) var activeIndex = this.getItemIndex(this.$active = this.$element.find('.carousel-item.active'))
if (pos > (this.$items.length - 1) || pos < 0) return if (pos > (this.$items.length - 1) || pos < 0) return
@ -404,7 +404,7 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.slide = function (type, next) { Carousel.prototype.slide = function (type, next) {
var $active = this.$element.find('.item.active') var $active = this.$element.find('.carousel-item.active')
var $next = next || this.getItemForDirection(type, $active) var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right' var direction = type == 'next' ? 'left' : 'right'

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

39
docs/dist/css/bootstrap.css vendored
View File

@ -97,7 +97,6 @@ figure {
hr { hr {
height: 0; height: 0;
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
} }
@ -144,7 +143,6 @@ input {
input[type="checkbox"], input[type="radio"] { input[type="checkbox"], input[type="radio"] {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding: 0; padding: 0;
} }
@ -155,7 +153,6 @@ input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-o
input[type="search"] { input[type="search"] {
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
-webkit-appearance: textfield; -webkit-appearance: textfield;
} }
@ -244,10 +241,6 @@ td, th {
page-break-after: avoid; page-break-after: avoid;
} }
select {
background: #fff !important;
}
.navbar { .navbar {
display: none; display: none;
} }
@ -274,7 +267,6 @@ td, th {
*, *:before, *:after { *, *:before, *:after {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
@ -320,7 +312,7 @@ img {
vertical-align: middle; vertical-align: middle;
} }
.img-responsive, .carousel-inner > .item > img, .carousel-inner > .item > a > img { .img-responsive, .carousel-inner > .carousel-item > img, .carousel-inner > .carousel-item > a > img {
display: block; display: block;
max-width: 100%; max-width: 100%;
height: auto; height: auto;
@ -1923,7 +1915,6 @@ label {
input[type="search"] { input[type="search"] {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
@ -1969,7 +1960,6 @@ output {
line-height: 1.5; line-height: 1.5;
color: #55595c; color: #55595c;
background-color: #fff; background-color: #fff;
background-image: none;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: .25rem; border-radius: .25rem;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
@ -2377,7 +2367,6 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
background-image: none;
border: .075rem solid transparent; border: .075rem solid transparent;
border-radius: .25rem; border-radius: .25rem;
-webkit-transition: all .2s ease-in-out; -webkit-transition: all .2s ease-in-out;
@ -3683,18 +3672,20 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
text-decoration: none; text-decoration: none;
background-color: #eceeef; background-color: #eceeef;
} }
.pager .next > a, .pager .next > span {
float: right;
}
.pager .previous > a, .pager .previous > span {
float: left;
}
.pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span {
color: #818a91; color: #818a91;
cursor: not-allowed; cursor: not-allowed;
background-color: #fff; background-color: #fff;
} }
.pager-next > a, .pager-next > span {
float: right;
}
.pager-prev > a, .pager-prev > span {
float: left;
}
.label { .label {
display: inline-block; display: inline-block;
padding: .25em .4em; padding: .25em .4em;
@ -4719,18 +4710,18 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.carousel-inner > .item { .carousel-inner > .carousel-item {
position: relative; position: relative;
display: none; display: none;
-webkit-transition: .6s ease-in-out left; -webkit-transition: .6s ease-in-out left;
-o-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left;
transition: .6s ease-in-out left; transition: .6s ease-in-out left;
} }
.carousel-inner > .item > img, .carousel-inner > .item > a > img { .carousel-inner > .carousel-item > img, .carousel-inner > .carousel-item > a > img {
line-height: 1; line-height: 1;
} }
@media all and (transform-3d), (-webkit-transform-3d) { @media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item { .carousel-inner > .carousel-item {
-webkit-transition: -webkit-transform .6s ease-in-out; -webkit-transition: -webkit-transform .6s ease-in-out;
-o-transition: -o-transform .6s ease-in-out; -o-transition: -o-transform .6s ease-in-out;
transition: transform .6s ease-in-out; transition: transform .6s ease-in-out;
@ -4740,17 +4731,17 @@ a.list-group-item-state.active, a.list-group-item-state.active:hover, a.list-gro
-webkit-perspective: 1000; -webkit-perspective: 1000;
perspective: 1000; perspective: 1000;
} }
.carousel-inner > .item.next, .carousel-inner > .item.active.right { .carousel-inner > .carousel-item.next, .carousel-inner > .carousel-item.active.right {
left: 0; left: 0;
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
} }
.carousel-inner > .item.prev, .carousel-inner > .item.active.left { .carousel-inner > .carousel-item.prev, .carousel-inner > .carousel-item.active.left {
left: 0; left: 0;
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
} }
.carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { .carousel-inner > .carousel-item.next.left, .carousel-inner > .carousel-item.prev.right, .carousel-inner > .carousel-item.active {
left: 0; left: 0;
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
docs/dist/js/bootstrap.js vendored
View File

@ -354,7 +354,7 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.getItemIndex = function (item) { Carousel.prototype.getItemIndex = function (item) {
this.$items = item.parent().children('.item') this.$items = item.parent().children('.carousel-item')
return this.$items.index(item || this.$active) return this.$items.index(item || this.$active)
} }
@ -370,7 +370,7 @@ if (typeof jQuery === 'undefined') {
Carousel.prototype.to = function (pos) { Carousel.prototype.to = function (pos) {
var that = this var that = this
var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) var activeIndex = this.getItemIndex(this.$active = this.$element.find('.carousel-item.active'))
if (pos > (this.$items.length - 1) || pos < 0) return if (pos > (this.$items.length - 1) || pos < 0) return
@ -404,7 +404,7 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.slide = function (type, next) { Carousel.prototype.slide = function (type, next) {
var $active = this.$element.find('.item.active') var $active = this.$element.find('.carousel-item.active')
var $next = next || this.getItemForDirection(type, $active) var $next = next || this.getItemForDirection(type, $active)
var isCycling = this.interval var isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right' var direction = type == 'next' ? 'left' : 'right'
@ -1457,7 +1457,7 @@ if (typeof jQuery === 'undefined') {
var marginTop = parseInt($tip.css('margin-top'), 10) var marginTop = parseInt($tip.css('margin-top'), 10)
var marginLeft = parseInt($tip.css('margin-left'), 10) var marginLeft = parseInt($tip.css('margin-left'), 10)
// we must check for NaN for ie 8/9 // we must check for NaN for IE9
if (isNaN(marginTop)) marginTop = 0 if (isNaN(marginTop)) marginTop = 0
if (isNaN(marginLeft)) marginLeft = 0 if (isNaN(marginLeft)) marginLeft = 0

2
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
docs/examples/signin/signin.css
View File

@ -20,7 +20,6 @@ body {
position: relative; position: relative;
height: auto; height: auto;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;