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
7bb88179
Commit
7bb88179
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
finish flattening repo structure; add dist folder of compiled css/js
parent
a8005b3d
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
.gitignore
+0
-1
.gitignore
Makefile
+8
-8
Makefile
_includes/footer.html
+2
-2
_includes/footer.html
_includes/header.html
+2
-2
_includes/header.html
assets/js/holder.js
+0
-0
assets/js/holder.js
assets/js/respond.min.js
+0
-0
assets/js/respond.min.js
dist/css/bootstrap.css
+0
-0
dist/css/bootstrap.css
dist/js/bootstrap.js
+0
-0
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
with
13 additions
and
14 deletions
+13
-14
.gitignore
+
0
-
1
View file @
7bb88179
...
@@ -39,4 +39,3 @@ nbproject
...
@@ -39,4 +39,3 @@ nbproject
.CVS
.CVS
.idea
.idea
node_modules
node_modules
dist
This diff is collapsed.
Click to expand it.
Makefile
+
8
-
8
View file @
7bb88179
BOOTSTRAP
?=
./d
ocs/assets
/css/bootstrap.css
BOOTSTRAP
?=
./d
ist
/css/bootstrap.css
BOOTSTRAP_LESS
?=
./less/bootstrap.less
BOOTSTRAP_LESS
?=
./less/bootstrap.less
DATE
=
$(
shell
date
+%I:%M%p
)
DATE
=
$(
shell
date
+%I:%M%p
)
CHECK
=
\0
33[32m✔ Done
\0
33[39m
CHECK
=
\0
33[32m✔ Done
\0
33[39m
...
@@ -22,14 +22,14 @@ build:
...
@@ -22,14 +22,14 @@ build:
@
recess
--compile
${BOOTSTRAP_LESS}
>
${BOOTSTRAP}
@
recess
--compile
${BOOTSTRAP_LESS}
>
${BOOTSTRAP}
@
echo
"
${CHECK}
"
@
echo
"
${CHECK}
"
@
printf
"Prepping documentation assets..."
@
printf
"Prepping documentation assets..."
@
cp
js/tests/vendor/jquery.js
docs/
assets/js/
@
cp
js/tests/vendor/jquery.js assets/js/
@
echo
"
${CHECK}
"
@
echo
"
${CHECK}
"
@
printf
"Compiling and minifying JavaScript..."
@
printf
"Compiling and minifying JavaScript..."
@
cat
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
d
ocs/assets
/js/bootstrap.js
@
cat
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
d
ist
/js/bootstrap.js
@
uglifyjs
-nc
d
ocs/assets
/js/bootstrap.js
>
d
ocs/assets
/js/bootstrap.min.tmp.js
@
uglifyjs
-nc
d
ist
/js/bootstrap.js
>
d
ist
/js/bootstrap.min.tmp.js
@
echo
"/**
\n
* Bootstrap.js v3.0.0 by @fat & @mdo
\n
* Copyright 201
2
Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
d
ocs/assets
/js/copyright.js
@
echo
"/**
\n
* Bootstrap.js v3.0.0 by @fat & @mdo
\n
* Copyright 201
3
Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
d
ist
/js/copyright.js
@
cat
d
ocs/assets
/js/copyright.js d
ocs/assets
/js/bootstrap.min.tmp.js
>
d
ocs/assets
/js/bootstrap.min.js
@
cat
d
ist
/js/copyright.js d
ist
/js/bootstrap.min.tmp.js
>
d
ist
/js/bootstrap.min.js
@
rm
d
ocs/assets
/js/copyright.js d
ocs/assets
/js/bootstrap.min.tmp.js
@
rm
d
ist
/js/copyright.js d
ist
/js/bootstrap.min.tmp.js
@
echo
"
${CHECK}
"
@
echo
"
${CHECK}
"
@
echo
"
${HR}
"
@
echo
"
${HR}
"
@
echo
"
\0
33[36mSuccess!
\n\0
33[39m"
@
echo
"
\0
33[36mSuccess!
\n\0
33[39m"
...
@@ -72,7 +72,7 @@ bootstrap/js/*.js: js/*.js
...
@@ -72,7 +72,7 @@ bootstrap/js/*.js: js/*.js
mkdir
-p
bootstrap/js
mkdir
-p
bootstrap/js
cat
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
bootstrap/js/bootstrap.js
cat
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
bootstrap/js/bootstrap.js
uglifyjs
-nc
bootstrap/js/bootstrap.js
>
bootstrap/js/bootstrap.min.tmp.js
uglifyjs
-nc
bootstrap/js/bootstrap.js
>
bootstrap/js/bootstrap.min.tmp.js
echo
"/*!
\n
* Bootstrap.js by @fat & @mdo
\n
* Copyright 201
2
Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
bootstrap/js/copyright.js
echo
"/*!
\n
* Bootstrap.js by @fat & @mdo
\n
* Copyright 201
3
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
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
rm
bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
...
...
This diff is collapsed.
Click to expand it.
_includes/footer.html
+
2
-
2
View file @
7bb88179
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
================================================== -->
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- Placed at the end of the document so the pages load faster -->
<script
src=
"/assets/js/jquery.js"
></script>
<script
src=
"/assets/js/jquery.js"
></script>
<script
src=
"/
assets
/js/bootstrap.js"
></script>
<script
src=
"/
dist
/js/bootstrap.js"
></script>
<script
type=
"text/javascript"
src=
"http://platform.twitter.com/widgets.js"
></script>
<script
type=
"text/javascript"
src=
"http://platform.twitter.com/widgets.js"
></script>
<script
src=
"/assets/js/holder
/holder
.js"
></script>
<script
src=
"/assets/js/holder.js"
></script>
<script
src=
"/assets/js/application.js"
></script>
<script
src=
"/assets/js/application.js"
></script>
...
...
This diff is collapsed.
Click to expand it.
_includes/header.html
+
2
-
2
View file @
7bb88179
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
</title>
</title>
<!-- Bootstrap core CSS -->
<!-- Bootstrap core CSS -->
<link
href=
"/
assets
/css/bootstrap.css"
rel=
"stylesheet"
>
<link
href=
"/
dist
/css/bootstrap.css"
rel=
"stylesheet"
>
{% if page.layout != "example" %}
{% if page.layout != "example" %}
<!-- Documentation extras -->
<!-- Documentation extras -->
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<!--[if lt IE 9]>
<script src="/assets/js/html5shiv.js"></script>
<script src="/assets/js/html5shiv.js"></script>
<script src="/assets/js/respond
/respond
.min.js"></script>
<script src="/assets/js/respond.min.js"></script>
<![endif]-->
<![endif]-->
<!-- Favicons -->
<!-- Favicons -->
...
...
This diff is collapsed.
Click to expand it.
assets/js/holder
/holder
.js
→
assets/js/holder.js
+
0
-
0
View file @
7bb88179
File moved
This diff is collapsed.
Click to expand it.
assets/js/respond
/respond
.min.js
→
assets/js/respond.min.js
+
0
-
0
View file @
7bb88179
File moved
This diff is collapsed.
Click to expand it.
assets
/css/bootstrap.css
→
dist
/css/bootstrap.css
+
0
-
0
View file @
7bb88179
File moved
This diff is collapsed.
Click to expand it.
assets
/js/bootstrap.js
→
dist
/js/bootstrap.js
+
0
-
0
View file @
7bb88179
File moved
This diff is collapsed.
Click to expand it.
assets
/js/bootstrap.min.js
→
dist
/js/bootstrap.min.js
+
1
-
1
View file @
7bb88179
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