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
fa6a6dbb
Commit
fa6a6dbb
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #6057 from ph-One/patch-3
Update Makefile's UglifyJS commands
parents
78390d12
fe8df502
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+2
-2
Makefile
with
2 additions
and
2 deletions
+2
-2
Makefile
+
2
-
2
View file @
fa6a6dbb
...
...
@@ -27,7 +27,7 @@ build:
@
cp
js/tests/vendor/jquery.js docs/assets/js/
@
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 js/bootstrap-affix.js
>
docs/assets/js/bootstrap.js
@
uglifyjs
-nc
docs/assets/js/bootstrap.js
>
docs/assets/js/bootstrap.min.tmp.js
@
uglifyjs docs/assets/js/bootstrap.js
-nc
>
docs/assets/js/bootstrap.min.tmp.js
@
echo
"/**
\n
* Bootstrap.js v2.2.2 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
@
rm
docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
...
...
@@ -72,7 +72,7 @@ bootstrap:
recess
--compile
${BOOTSTRAP_RESPONSIVE_LESS}
>
bootstrap/css/bootstrap-responsive.css
recess
--compress
${BOOTSTRAP_RESPONSIVE_LESS}
>
bootstrap/css/bootstrap-responsive.min.css
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
>
bootstrap/js/bootstrap.js
uglifyjs
-nc
bootstrap/js/bootstrap.js
>
bootstrap/js/bootstrap.min.tmp.js
uglifyjs bootstrap/js/bootstrap.js
-nc
>
bootstrap/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
*/"
>
bootstrap/js/copyright.js
cat
bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
>
bootstrap/js/bootstrap.min.js
rm
bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.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