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
74bda55d
Commit
74bda55d
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
Add affix.js to javascript compilation
parents
b0437bef
6a152132
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+1
-1
Makefile
with
1 addition
and
1 deletion
+1
-1
Makefile
+
1
-
1
View file @
74bda55d
...
@@ -26,7 +26,7 @@ build:
...
@@ -26,7 +26,7 @@ build:
@
cp
js/
*
.js docs/assets/js/
@
cp
js/
*
.js docs/assets/js/
@
cp
js/tests/vendor/jquery.js docs/assets/js/
@
cp
js/tests/vendor/jquery.js docs/assets/js/
@
echo
"Compiling documentation...
${CHECK}
Done"
@
echo
"Compiling documentation...
${CHECK}
Done"
@
cat
js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js
>
docs/assets/js/bootstrap.js
@
cat
js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js
js/bootstrap-affix.js
>
docs/assets/js/bootstrap.js
@
uglifyjs
-nc
docs/assets/js/bootstrap.js
>
docs/assets/js/bootstrap.min.tmp.js
@
uglifyjs
-nc
docs/assets/js/bootstrap.js
>
docs/assets/js/bootstrap.min.tmp.js
@
echo
"/**
\n
* Bootstrap.js by @fat & @mdo
\n
* Copyright 2012 Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
docs/assets/js/copyright.js
@
echo
"/**
\n
* Bootstrap.js by @fat & @mdo
\n
* Copyright 2012 Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
docs/assets/js/copyright.js
@
cat
docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
>
docs/assets/js/bootstrap.min.js
@
cat
docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
>
docs/assets/js/bootstrap.min.js
...
...
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