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:
Mark Otto
2017-03-27 22:56:14 -07:00
parent bebdbe4119
commit 7742ba6dc9
14 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
+10 -9
View File
@@ -4537,10 +4537,6 @@ tbody.collapse.show {
border-left: 0; border-left: 0;
} }
.card-img {
border-radius: calc(0.25rem - 1px);
}
.card-img-overlay { .card-img-overlay {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -4550,12 +4546,19 @@ tbody.collapse.show {
padding: 1.25rem; padding: 1.25rem;
} }
.card-img {
width: 100%;
border-radius: calc(0.25rem - 1px);
}
.card-img-top { .card-img-top {
width: 100%;
border-top-left-radius: calc(0.25rem - 1px); border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px);
} }
.card-img-bottom { .card-img-bottom {
width: 100%;
border-bottom-right-radius: calc(0.25rem - 1px); border-bottom-right-radius: calc(0.25rem - 1px);
border-bottom-left-radius: calc(0.25rem - 1px); border-bottom-left-radius: calc(0.25rem - 1px);
} }
@@ -4571,6 +4574,8 @@ tbody.collapse.show {
-webkit-flex-flow: row wrap; -webkit-flex-flow: row wrap;
-ms-flex-flow: row wrap; -ms-flex-flow: row wrap;
flex-flow: row wrap; flex-flow: row wrap;
margin-right: -15px;
margin-left: -15px;
} }
.card-deck .card { .card-deck .card {
display: -webkit-box; display: -webkit-box;
@@ -4586,12 +4591,8 @@ tbody.collapse.show {
-webkit-flex-direction: column; -webkit-flex-direction: column;
-ms-flex-direction: column; -ms-flex-direction: column;
flex-direction: column; flex-direction: column;
}
.card-deck .card:not(:first-child) {
margin-left: 15px;
}
.card-deck .card:not(:last-child) {
margin-right: 15px; margin-right: 15px;
margin-left: 15px;
} }
} }
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/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/js/bootstrap.js
+3 -1
View File
@@ -1344,7 +1344,9 @@ var Collapse = function ($) {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); if (/input|textarea/i.test(event.target.tagName)) {
event.preventDefault();
}
var target = Collapse._getTargetFromElement(this); var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY); var data = $(target).data(DATA_KEY);
dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
+10 -9
View File
@@ -4537,10 +4537,6 @@ tbody.collapse.show {
border-left: 0; border-left: 0;
} }
.card-img {
border-radius: calc(0.25rem - 1px);
}
.card-img-overlay { .card-img-overlay {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -4550,12 +4546,19 @@ tbody.collapse.show {
padding: 1.25rem; padding: 1.25rem;
} }
.card-img {
width: 100%;
border-radius: calc(0.25rem - 1px);
}
.card-img-top { .card-img-top {
width: 100%;
border-top-left-radius: calc(0.25rem - 1px); border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px);
} }
.card-img-bottom { .card-img-bottom {
width: 100%;
border-bottom-right-radius: calc(0.25rem - 1px); border-bottom-right-radius: calc(0.25rem - 1px);
border-bottom-left-radius: calc(0.25rem - 1px); border-bottom-left-radius: calc(0.25rem - 1px);
} }
@@ -4571,6 +4574,8 @@ tbody.collapse.show {
-webkit-flex-flow: row wrap; -webkit-flex-flow: row wrap;
-ms-flex-flow: row wrap; -ms-flex-flow: row wrap;
flex-flow: row wrap; flex-flow: row wrap;
margin-right: -15px;
margin-left: -15px;
} }
.card-deck .card { .card-deck .card {
display: -webkit-box; display: -webkit-box;
@@ -4586,12 +4591,8 @@ tbody.collapse.show {
-webkit-flex-direction: column; -webkit-flex-direction: column;
-ms-flex-direction: column; -ms-flex-direction: column;
flex-direction: column; flex-direction: column;
}
.card-deck .card:not(:first-child) {
margin-left: 15px;
}
.card-deck .card:not(:last-child) {
margin-right: 15px; margin-right: 15px;
margin-left: 15px;
} }
} }
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/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
+3 -1
View File
@@ -1344,7 +1344,9 @@ var Collapse = function ($) {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); if (/input|textarea/i.test(event.target.tagName)) {
event.preventDefault();
}
var target = Collapse._getTargetFromElement(this); var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY); var data = $(target).data(DATA_KEY);
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
js/dist/collapse.js
Vendored
+3 -1
View File
@@ -338,7 +338,9 @@ var Collapse = function ($) {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); if (/input|textarea/i.test(event.target.tagName)) {
event.preventDefault();
}
var target = Collapse._getTargetFromElement(this); var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY); var data = $(target).data(DATA_KEY);
js/dist/collapse.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long