kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Update gruntfile to point to new customizer nav, run grunt

Browse source
This commit is contained in:
Mark Otto 2014-03-16 20:40:30 -07:00
parent c93c371433
commit 43cf003f9a
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -337,7 +337,7 @@ module.exports = function (grunt) {
}, },
files: { files: {
'docs/_includes/customizer-variables.html': 'docs/jade/customizer-variables.jade', 'docs/_includes/customizer-variables.html': 'docs/jade/customizer-variables.jade',
'docs/_includes/nav-customize.html': 'docs/jade/customizer-nav.jade' 'docs/_includes/nav/customize.html': 'docs/jade/customizer-nav.jade'
} }
} }
}, },

4
dist/js/bootstrap.js vendored
View file

@ -1894,8 +1894,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var offsetTop = offset.top var offsetTop = offset.top
var offsetBottom = offset.bottom var offsetBottom = offset.bottom
if (this.affixed == 'top') position.top += scrollTop
if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
@ -1923,7 +1921,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
.trigger($.Event(affixType.replace('affix', 'affixed'))) .trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') { if (affix == 'bottom') {
this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() }) this.$element.offset({ top: position.top })
} }
} }

2
dist/js/bootstrap.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
docs/dist/js/bootstrap.min.js vendored
View file

File diff suppressed because one or more lines are too long