mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

grunt

Browse Source
This commit is contained in:
Heinrich Fenkart
2014-09-25 02:23:48 +02:00
parent 61a4fee626
commit 7ce6824748
12 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+14 -3
View File
@@ -3178,9 +3178,11 @@ input[type="button"].btn-block {
} }
.collapse { .collapse {
display: none; display: none;
visibility: hidden;
} }
.collapse.in { .collapse.in {
display: block; display: block;
visibility: visible;
} }
tr.collapse.in { tr.collapse.in {
display: table-row; display: table-row;
@@ -3192,9 +3194,15 @@ tbody.collapse.in {
position: relative; position: relative;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
-webkit-transition: height .35s ease; -webkit-transition-timing-function: ease;
-o-transition: height .35s ease; -o-transition-timing-function: ease;
transition: height .35s ease; transition-timing-function: ease;
-webkit-transition-duration: .35s;
-o-transition-duration: .35s;
transition-duration: .35s;
-webkit-transition-property: height, visibility;
-o-transition-property: height, visibility;
transition-property: height, visibility;
} }
.caret { .caret {
display: inline-block; display: inline-block;
@@ -3845,9 +3853,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.tab-content > .tab-pane { .tab-content > .tab-pane {
display: none; display: none;
visibility: hidden;
} }
.tab-content > .active { .tab-content > .active {
display: block; display: block;
visibility: visible;
} }
.nav-tabs .dropdown-menu { .nav-tabs .dropdown-menu {
margin-top: -1px; margin-top: -1px;
@@ -3894,6 +3904,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
visibility: visible !important;
} }
.navbar-collapse.in { .navbar-collapse.in {
overflow-y: visible; overflow-y: visible;
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
+1 -5
View File
@@ -1458,7 +1458,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var el = $element[0] var el = $element[0]
var isBody = el.tagName == 'BODY' var isBody = el.tagName == 'BODY'
var isSvg = window.SVGElement && el instanceof window.SVGElement
var elRect = el.getBoundingClientRect() var elRect = el.getBoundingClientRect()
if (elRect.width == null) { if (elRect.width == null) {
@@ -1467,10 +1466,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
} }
var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isSvg ? {} : { var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
width: isBody ? $(window).width() : $element.outerWidth(),
height: isBody ? $(window).height() : $element.outerHeight()
}
return $.extend({}, elRect, scroll, outerDims, elOffset) return $.extend({}, elRect, scroll, outerDims, elOffset)
} }
dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
Vendored
+14 -3
View File
@@ -3178,9 +3178,11 @@ input[type="button"].btn-block {
} }
.collapse { .collapse {
display: none; display: none;
visibility: hidden;
} }
.collapse.in { .collapse.in {
display: block; display: block;
visibility: visible;
} }
tr.collapse.in { tr.collapse.in {
display: table-row; display: table-row;
@@ -3192,9 +3194,15 @@ tbody.collapse.in {
position: relative; position: relative;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
-webkit-transition: height .35s ease; -webkit-transition-timing-function: ease;
-o-transition: height .35s ease; -o-transition-timing-function: ease;
transition: height .35s ease; transition-timing-function: ease;
-webkit-transition-duration: .35s;
-o-transition-duration: .35s;
transition-duration: .35s;
-webkit-transition-property: height, visibility;
-o-transition-property: height, visibility;
transition-property: height, visibility;
} }
.caret { .caret {
display: inline-block; display: inline-block;
@@ -3845,9 +3853,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.tab-content > .tab-pane { .tab-content > .tab-pane {
display: none; display: none;
visibility: hidden;
} }
.tab-content > .active { .tab-content > .active {
display: block; display: block;
visibility: visible;
} }
.nav-tabs .dropdown-menu { .nav-tabs .dropdown-menu {
margin-top: -1px; margin-top: -1px;
@@ -3894,6 +3904,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
visibility: visible !important;
} }
.navbar-collapse.in { .navbar-collapse.in {
overflow-y: visible; overflow-y: visible;
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
Vendored
+1 -5
View File
@@ -1458,7 +1458,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var el = $element[0] var el = $element[0]
var isBody = el.tagName == 'BODY' var isBody = el.tagName == 'BODY'
var isSvg = window.SVGElement && el instanceof window.SVGElement
var elRect = el.getBoundingClientRect() var elRect = el.getBoundingClientRect()
if (elRect.width == null) { if (elRect.width == null) {
@@ -1467,10 +1466,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
} }
var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isSvg ? {} : { var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
width: isBody ? $(window).width() : $element.outerWidth(),
height: isBody ? $(window).height() : $element.outerHeight()
}
return $.extend({}, elRect, scroll, outerDims, elOffset) return $.extend({}, elRect, scroll, outerDims, elOffset)
} }
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long