Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
49d565a6
Commit
49d565a6
authored
13 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
move building zip file into docs/makefile
parent
22d52fca
2 merge requests
!1475
2.0 wip
,
!1403
warningText and warningBackground docs fix
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+32
-21
Makefile
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/index.html
+1
-1
docs/index.html
docs/templates/pages/index.mustache
+1
-1
docs/templates/pages/index.mustache
with
34 additions
and
23 deletions
+34
-23
Makefile
+
32
-
21
View file @
49d565a6
...
@@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc`
...
@@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc`
WATCHR
?=
`
which watchr
`
WATCHR
?=
`
which watchr
`
#
#
# B
uild less files + docs
# B
UILD DOCS
#
#
build
:
docs
:
dist
@
if
test
!
-z
${LESS_COMPRESSOR}
;
then
\
cp
-r
dist bootstrap
lessc
${BOOTSTRAP_LESS}
>
${BOOTSTRAP}
;
\
zip
-r
docs/assets/bootstrap.zip bootstrap
lessc
${BOOTSTRAP_RESPONSIVE_LESS}
>
${BOOTSTRAP_RESPONSIVE}
;
\
rm
-r
bootstrap
node docs/build
;
\
lessc
${BOOTSTRAP_LESS}
>
${BOOTSTRAP}
cp
img/
*
docs/assets/img/
;
\
lessc
${BOOTSTRAP_RESPONSIVE_LESS}
>
${BOOTSTRAP_RESPONSIVE}
else
\
node docs/build
echo
"You must have the LESS compiler installed in order to build Bootstrap."
;
\
cp
img/
*
docs/assets/img/
echo
"You can install it by running: npm install less -g"
;
\
fi
#
#
# Watch less files
# BUILD SIMPLE DIST DIRECTORY
# lessc & uglifyjs are required
#
dist
:
mkdir
-p
dist/img
mkdir
-p
dist/css
mkdir
-p
dist/js
cp
img/
*
dist/img/
lessc
${BOOTSTRAP_LESS}
>
dist/css/bootstrap.css
lessc
--compress
${BOOTSTRAP_LESS}
>
dist/css/bootstrap.min.css
lessc
${BOOTSTRAP_RESPONSIVE_LESS}
>
dist/css/bootstrap.responsive
lessc
--compress
${BOOTSTRAP_RESPONSIVE_LESS}
>
dist/css/bootstrap.min.responsive
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
>
dist/js/bootstrap.js
uglifyjs
-nc
dist/js/bootstrap.js
>
dist/js/bootstrap.min.js
#
# WATCH LESS FILES
#
#
watch
:
watch
:
@
if
test
!
-z
${WATCHR}
;
then
\
echo
"Watching less files..."
;
\
echo
"Watching less files..."
;
\
watchr
-e
"watch('less/.*
\.
less') { system 'make' }"
watchr
-e
"watch('less/.*
\.
less') { system 'make' }"
;
\
else
\
echo
"You must have the watchr installed in order to watch Bootstrap Less files."
;
\
.PHONY
:
dist docs watch
echo
"You can install it by running: gem install watchr"
;
\
\ No newline at end of file
fi
.PHONY
:
build watch
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docs/assets/bootstrap.zip
0 → 100644
+
0
-
0
View file @
49d565a6
File added
This diff is collapsed.
Click to expand it.
docs/index.html
+
1
-
1
View file @
49d565a6
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
<p>
Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
</p>
<p>
Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
</p>
<p
class=
"download-info"
>
<p
class=
"download-info"
>
<a
href=
"https://github.com/twitter/bootstrap/"
class=
"btn primary btn-large"
>
View project on GitHub
</a>
<a
href=
"https://github.com/twitter/bootstrap/"
class=
"btn primary btn-large"
>
View project on GitHub
</a>
<a
href=
"
http://bootstrap.herokuapp.com
/bootstrap.zip"
class=
"btn btn-large"
>
Download Bootstrap
</a>
<a
href=
"
assets
/bootstrap.zip"
class=
"btn btn-large"
>
Download Bootstrap
</a>
</p>
</p>
<div
class=
"benefits"
>
<div
class=
"benefits"
>
<h4>
Feature highlights
</h4>
<h4>
Feature highlights
</h4>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/index.mustache
+
1
-
1
View file @
49d565a6
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<p>
Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
</p>
<p>
Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
</p>
<p
class=
"download-info"
>
<p
class=
"download-info"
>
<a
href=
"https://github.com/twitter/bootstrap/"
class=
"btn primary btn-large"
>
{{
_i
}}
View project on GitHub
{{/
i
}}
</a>
<a
href=
"https://github.com/twitter/bootstrap/"
class=
"btn primary btn-large"
>
{{
_i
}}
View project on GitHub
{{/
i
}}
</a>
<a
href=
"
http://bootstrap.herokuapp.com
/bootstrap.zip"
class=
"btn btn-large"
>
{{
_i
}}
Download Bootstrap
{{/
i
}}
</a>
<a
href=
"
assets
/bootstrap.zip"
class=
"btn btn-large"
>
{{
_i
}}
Download Bootstrap
{{/
i
}}
</a>
</p>
</p>
<div
class=
"benefits"
>
<div
class=
"benefits"
>
<h4>
{{
_i
}}
Feature highlights
{{/
i
}}
</h4>
<h4>
{{
_i
}}
Feature highlights
{{/
i
}}
</h4>
...
...
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
Menu
Explore
Projects
Groups
Snippets