2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
This commit is contained in:
Mark Otto
2018-01-03 16:03:22 -08:00
parent 20765b5025
commit 34cd2038d2
19 changed files with 61 additions and 35 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+34 -14
View File
@@ -1877,7 +1877,7 @@ pre code {
background-color: rgba(255, 255, 255, 0.075);
}
@media (max-width: 575.99px) {
@media (max-width: 575.98px) {
.table-responsive-sm {
display: block;
width: 100%;
@@ -1890,7 +1890,7 @@ pre code {
}
}
@media (max-width: 767.99px) {
@media (max-width: 767.98px) {
.table-responsive-md {
display: block;
width: 100%;
@@ -1903,7 +1903,7 @@ pre code {
}
}
@media (max-width: 991.99px) {
@media (max-width: 991.98px) {
.table-responsive-lg {
display: block;
width: 100%;
@@ -1916,7 +1916,7 @@ pre code {
}
}
@media (max-width: 1199.99px) {
@media (max-width: 1199.98px) {
.table-responsive-xl {
display: block;
width: 100%;
@@ -2174,7 +2174,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
top: 100%;
z-index: 5;
display: none;
width: 250px;
max-width: 100%;
padding: .5rem;
margin-top: .1rem;
font-size: .875rem;
@@ -2265,7 +2265,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
top: 100%;
z-index: 5;
display: none;
width: 250px;
max-width: 100%;
padding: .5rem;
margin-top: .1rem;
font-size: .875rem;
@@ -3446,8 +3446,14 @@ tbody.collapse.show {
}
.input-group .form-control + .form-control,
.input-group .form-control + .custom-select,
.input-group .form-control + .custom-file,
.input-group .custom-select + .form-control,
.input-group .custom-file + .form-control {
.input-group .custom-select + .custom-select,
.input-group .custom-select + .custom-file,
.input-group .custom-file + .form-control,
.input-group .custom-file + .custom-select,
.input-group .custom-file + .custom-file {
margin-left: -1px;
}
@@ -3994,7 +4000,7 @@ tbody.collapse.show {
background-size: 100% 100%;
}
@media (max-width: 575.99px) {
@media (max-width: 575.98px) {
.navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0;
@@ -4050,7 +4056,7 @@ tbody.collapse.show {
}
}
@media (max-width: 767.99px) {
@media (max-width: 767.98px) {
.navbar-expand-md > .container,
.navbar-expand-md > .container-fluid {
padding-right: 0;
@@ -4106,7 +4112,7 @@ tbody.collapse.show {
}
}
@media (max-width: 991.99px) {
@media (max-width: 991.98px) {
.navbar-expand-lg > .container,
.navbar-expand-lg > .container-fluid {
padding-right: 0;
@@ -4162,7 +4168,7 @@ tbody.collapse.show {
}
}
@media (max-width: 1199.99px) {
@media (max-width: 1199.98px) {
.navbar-expand-xl > .container,
.navbar-expand-xl > .container-fluid {
padding-right: 0;
@@ -4688,13 +4694,19 @@ tbody.collapse.show {
border: 1px solid #dee2e6;
}
.page-link:focus, .page-link:hover {
.page-link:hover {
color: #0056b3;
text-decoration: none;
background-color: #e9ecef;
border-color: #dee2e6;
}
.page-link:focus {
z-index: 2;
outline: 0;
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.page-link:not([disabled]):not(.disabled) {
cursor: pointer;
}
@@ -8923,8 +8935,7 @@ a.text-dark:focus, a.text-dark:hover {
text-shadow: none !important;
box-shadow: none !important;
}
a,
a:visited {
a:not(.btn) {
text-decoration: underline;
}
abbr[title]::after {
@@ -8955,6 +8966,15 @@ a.text-dark:focus, a.text-dark:hover {
h3 {
page-break-after: avoid;
}
@page {
size: a3;
}
body {
min-width: 992px !important;
}
.container {
min-width: 992px !important;
}
.navbar {
display: none;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -2
View File
@@ -1097,6 +1097,8 @@ var Collapse = function ($$$1) {
var selector = Util.getSelectorFromElement(elem);
if (selector !== null && $$$1(selector).filter(element).length > 0) {
this._selector = selector;
this._triggerArray.push(elem);
}
}
@@ -1143,7 +1145,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
activesData = $$$1(actives).data(DATA_KEY);
activesData = $$$1(actives).not(this._selector).data(DATA_KEY);
if (activesData && activesData._isTransitioning) {
return;
@@ -1158,7 +1160,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
Collapse._jQueryInterface.call($$$1(actives), 'hide');
Collapse._jQueryInterface.call($$$1(actives).not(this._selector), 'hide');
if (!activesData) {
$$$1(actives).data(DATA_KEY, null);
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+4 -2
View File
@@ -1098,6 +1098,8 @@ var Collapse = function ($$$1) {
var selector = Util.getSelectorFromElement(elem);
if (selector !== null && $$$1(selector).filter(element).length > 0) {
this._selector = selector;
this._triggerArray.push(elem);
}
}
@@ -1144,7 +1146,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
activesData = $$$1(actives).data(DATA_KEY);
activesData = $$$1(actives).not(this._selector).data(DATA_KEY);
if (activesData && activesData._isTransitioning) {
return;
@@ -1159,7 +1161,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
Collapse._jQueryInterface.call($$$1(actives), 'hide');
Collapse._jQueryInterface.call($$$1(actives).not(this._selector), 'hide');
if (!activesData) {
$$$1(actives).data(DATA_KEY, null);
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -2
View File
@@ -74,6 +74,8 @@ var Collapse = function ($) {
var selector = Util.getSelectorFromElement(elem);
if (selector !== null && $(selector).filter(element).length > 0) {
this._selector = selector;
this._triggerArray.push(elem);
}
}
@@ -120,7 +122,7 @@ var Collapse = function ($) {
}
if (actives) {
activesData = $(actives).data(DATA_KEY);
activesData = $(actives).not(this._selector).data(DATA_KEY);
if (activesData && activesData._isTransitioning) {
return;
@@ -135,7 +137,7 @@ var Collapse = function ($) {
}
if (actives) {
Collapse._jQueryInterface.call($(actives), 'hide');
Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
if (!activesData) {
$(actives).data(DATA_KEY, null);
+1 -1
View File
File diff suppressed because one or more lines are too long