Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
43cf003f
Commit
43cf003f
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Update gruntfile to point to new customizer nav, run grunt
parent
c93c3714
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Gruntfile.js
+1
-1
Gruntfile.js
dist/js/bootstrap.js
+1
-3
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
docs/assets/js/raw-files.min.js
+1
-1
docs/assets/js/raw-files.min.js
docs/dist/js/bootstrap.min.js
+1
-1
docs/dist/js/bootstrap.min.js
with
5 additions
and
7 deletions
+5
-7
Gruntfile.js
+
1
-
1
View file @
43cf003f
...
@@ -337,7 +337,7 @@ module.exports = function (grunt) {
...
@@ -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
'
}
}
}
}
},
},
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.js
+
1
-
3
View file @
43cf003f
...
@@ -1894,8 +1894,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -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
...
@@ -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
})
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
43cf003f
This diff is collapsed.
Click to expand it.
docs/assets/js/raw-files.min.js
+
1
-
1
View file @
43cf003f
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.min.js
+
1
-
1
View file @
43cf003f
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment