Skip to content
GitLab
Commit 3c99de97 authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent f9fde567
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 13 deletions
+13 -13
dist/css/bootstrap.css
+ 3
- 3
View file @ 3c99de97
......@@ -3984,7 +3984,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
padding-top: 15px;
padding-bottom: 15px;
}
.navbar-nav.navbar-right:last-child {
.navbar-nav.navbar-right:first-child {
margin-right: -15px;
}
}
......@@ -4070,7 +4070,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
-webkit-box-shadow: none;
box-shadow: none;
}
.navbar-form.navbar-right:last-child {
.navbar-form.navbar-right:first-child {
margin-right: -15px;
}
}
......@@ -4105,7 +4105,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-right: 15px;
margin-left: 15px;
}
.navbar-text.navbar-right:last-child {
.navbar-text.navbar-right:first-child {
margin-right: 0;
}
}
......
dist/css/bootstrap.css.map
-43 bytes (0%)
View file @ 3c99de97
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 3c99de97
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/bootstrap.js
+ 1
- 1
View file @ 3c99de97
......@@ -2055,7 +2055,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element
.removeClass(Affix.RESET)
.addClass(affixType)
.trigger($.Event(affixType.replace('affix', 'affixed')))
.trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
if (affix == 'bottom') {
this.$element.offset({
......
dist/js/bootstrap.min.js
+ 1
- 1
View file @ 3c99de97
This diff is collapsed.
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 3c99de97
This diff is collapsed.
docs/dist/css/bootstrap.css
+ 3
- 3
View file @ 3c99de97
......@@ -3984,7 +3984,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
padding-top: 15px;
padding-bottom: 15px;
}
.navbar-nav.navbar-right:last-child {
.navbar-nav.navbar-right:first-child {
margin-right: -15px;
}
}
......@@ -4070,7 +4070,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
-webkit-box-shadow: none;
box-shadow: none;
}
.navbar-form.navbar-right:last-child {
.navbar-form.navbar-right:first-child {
margin-right: -15px;
}
}
......@@ -4105,7 +4105,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-right: 15px;
margin-left: 15px;
}
.navbar-text.navbar-right:last-child {
.navbar-text.navbar-right:first-child {
margin-right: 0;
}
}
......
docs/dist/css/bootstrap.css.map
-43 bytes (0%)
View file @ 3c99de97
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 3c99de97
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/js/bootstrap.js
+ 1
- 1
View file @ 3c99de97
......@@ -2055,7 +2055,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.$element
.removeClass(Affix.RESET)
.addClass(affixType)
.trigger($.Event(affixType.replace('affix', 'affixed')))
.trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
if (affix == 'bottom') {
this.$element.offset({
......
docs/dist/js/bootstrap.min.js
+ 1
- 1
View file @ 3c99de97
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment