Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
7bb88179
Commit
7bb88179
authored
Jul 18, 2013
by
Mark Otto
Browse files
Options
Browse Files
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
with
13 additions
and
14 deletions
+13
-14
.gitignore
.gitignore
+0
-1
Makefile
Makefile
+8
-8
_includes/footer.html
_includes/footer.html
+2
-2
_includes/header.html
_includes/header.html
+2
-2
assets/js/holder.js
assets/js/holder.js
+0
-0
assets/js/respond.min.js
assets/js/respond.min.js
+0
-0
dist/css/bootstrap.css
dist/css/bootstrap.css
+0
-0
dist/js/bootstrap.js
dist/js/bootstrap.js
+0
-0
dist/js/bootstrap.min.js
dist/js/bootstrap.min.js
+1
-1
No files found.
.gitignore
View file @
7bb88179
...
@@ -39,4 +39,3 @@ nbproject
...
@@ -39,4 +39,3 @@ nbproject
.CVS
.CVS
.idea
.idea
node_modules
node_modules
dist
Makefile
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
>
docs/assets
/js/bootstrap.min.tmp.js
@
uglifyjs
-nc
d
ist/js/bootstrap.js
>
dist
/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
*/"
>
docs/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
*/"
>
dist
/js/copyright.js
@
cat
d
ocs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
>
docs/assets
/js/bootstrap.min.js
@
cat
d
ist/js/copyright.js dist/js/bootstrap.min.tmp.js
>
dist
/js/bootstrap.min.js
@
rm
d
ocs/assets/js/copyright.js docs/assets
/js/bootstrap.min.tmp.js
@
rm
d
ist/js/copyright.js dist
/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
...
...
_includes/footer.html
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>
...
...
_includes/header.html
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 -->
...
...
assets/js/holder
/holder
.js
→
assets/js/holder.js
View file @
7bb88179
File moved
assets/js/respond
/respond
.min.js
→
assets/js/respond.min.js
View file @
7bb88179
File moved
assets
/css/bootstrap.css
→
dist
/css/bootstrap.css
View file @
7bb88179
File moved
assets
/js/bootstrap.js
→
dist
/js/bootstrap.js
View file @
7bb88179
File moved
assets
/js/bootstrap.min.js
→
dist
/js/bootstrap.min.js
View file @
7bb88179
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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