Skip to content
GitLab
Commit dcd86a8a authored by Chris Rebert's avatar Chris Rebert
Browse files

grunt dist

parent 4fc8da4a
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
dist/css/bootstrap.css.map
-6 bytes (0%)
View file @ dcd86a8a
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/js/bootstrap.js
+ 1
- 1
View file @ dcd86a8a
...@@ -2208,7 +2208,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2208,7 +2208,7 @@ if (typeof jQuery === 'undefined') {
var colliderTop = initializing ? scrollTop : position.top var colliderTop = initializing ? scrollTop : position.top
var colliderHeight = initializing ? targetHeight : height var colliderHeight = initializing ? targetHeight : height
if (offsetTop != null && colliderTop <= offsetTop) return 'top' if (offsetTop != null && scrollTop <= offsetTop) return 'top'
if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
return false return false
......
dist/js/bootstrap.min.js
+ 1
- 1
View file @ dcd86a8a
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