mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+15 -13
View File
@@ -312,7 +312,7 @@ img {
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;
max-width: 100%;
height: auto;
@@ -3672,18 +3672,20 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
text-decoration: none;
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 {
color: #818a91;
cursor: not-allowed;
background-color: #fff;
}
.pager-next > a, .pager-next > span {
float: right;
}
.pager-prev > a, .pager-prev > span {
float: left;
}
.label {
display: inline-block;
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%;
overflow: hidden;
}
.carousel-inner > .item {
.carousel-inner > .carousel-item {
position: relative;
display: none;
-webkit-transition: .6s ease-in-out left;
-o-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;
}
@media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item {
.carousel-inner > .carousel-item {
-webkit-transition: -webkit-transform .6s ease-in-out;
-o-transition: -o-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;
perspective: 1000;
}
.carousel-inner > .item.next, .carousel-inner > .item.active.right {
.carousel-inner > .carousel-item.next, .carousel-inner > .carousel-item.active.right {
left: 0;
-webkit-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;
-webkit-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;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/js/bootstrap.js
Vendored
+3 -3
View File
@@ -354,7 +354,7 @@ if (typeof jQuery === 'undefined') {
}
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)
}
@@ -370,7 +370,7 @@ if (typeof jQuery === 'undefined') {
Carousel.prototype.to = function (pos) {
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
@@ -404,7 +404,7 @@ if (typeof jQuery === 'undefined') {
}
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 isCycling = this.interval
var direction = type == 'next' ? 'left' : 'right'
dist/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long