Skip to content

Commit 0bfbe50

Browse files
committed
Merge branch '2.0-wip'
Conflicts: .gitignore LICENSE Makefile bootstrap.css bootstrap.min.css docs/assets/js/application.js docs/assets/js/google-code-prettify/prettify.css docs/index.html docs/javascript.html examples/container-app.html examples/fluid.html examples/hero.html js/bootstrap-alerts.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tabs.js js/bootstrap-twipsy.js js/tests/index.html js/tests/unit/bootstrap-modal.js js/tests/unit/bootstrap-popover.js js/tests/unit/bootstrap-tabs.js lib/forms.less lib/mixins.less lib/patterns.less lib/scaffolding.less lib/tables.less
2 parents 43cbc94 + 4bd1ba4 commit 0bfbe50

File tree

221 files changed

+41444
-9539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+41444
-9539
lines changed

.gitignore

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
1+
# Numerous always-ignore extensions
2+
*.diff
3+
*.err
4+
*.orig
5+
*.log
6+
*.rej
7+
*.swo
8+
*.swp
9+
*.vi
110
*~
11+
*.sass-cache
12+
13+
# OS or Editor folders
214
.DS_Store
3-
thumbs.db
4-
js/min
15+
Thumbs.db
16+
.cache
17+
.project
18+
.settings
19+
.tmproj
20+
*.esproj
21+
nbproject
22+
*.sublime-project
23+
*.sublime-workspace
24+
25+
# Komodo
26+
*.komodoproject
27+
.komodotools
28+
29+
# Folders to ignore
30+
.hg
31+
.svn
32+
.CVS
33+
.idea

LICENSE

+10-173
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,13 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
1+
Copyright 2012 Twitter, Inc.
42

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
66

7-
1. Definitions.
7+
http://www.apache.org/licenses/LICENSE-2.0
88

9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
11-
12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

Makefile

+41-42
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,46 @@
1-
VERSION=1.4.0
2-
DATE=$(shell date)
3-
BOOTSTRAP = ./bootstrap.css
4-
BOOTSTRAP_MIN = ./bootstrap.min.css
5-
BOOTSTRAP_LESS = ./lib/bootstrap.less
1+
BOOTSTRAP = ./docs/assets/css/bootstrap.css
2+
BOOTSTRAP_LESS = ./less/bootstrap.less
3+
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
4+
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
65
LESS_COMPRESSOR ?= `which lessc`
7-
UGLIFY_JS ?= `which uglifyjs`
86
WATCHR ?= `which watchr`
97

10-
build:
11-
@@if test ! -z ${LESS_COMPRESSOR}; then \
12-
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
13-
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
14-
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
15-
rm -f ${BOOTSTRAP_LESS}.tmp; \
16-
echo "Bootstrap successfully built! - `date`"; \
17-
else \
18-
echo "You must have the LESS compiler installed in order to build Bootstrap."; \
19-
echo "You can install it by running: npm install less -g"; \
20-
fi
21-
22-
js/min:
23-
@@if test ! -z ${UGLIFY_JS}; then \
24-
mkdir -p js/min; \
25-
uglifyjs -o js/min/bootstrap-alerts.min.js js/bootstrap-alerts.js;\
26-
uglifyjs -o js/min/bootstrap-buttons.min.js js/bootstrap-buttons.js;\
27-
uglifyjs -o js/min/bootstrap-dropdown.min.js js/bootstrap-dropdown.js;\
28-
uglifyjs -o js/min/bootstrap-modal.min.js js/bootstrap-modal.js;\
29-
uglifyjs -o js/min/bootstrap-popover.min.js js/bootstrap-popover.js;\
30-
uglifyjs -o js/min/bootstrap-scrollspy.min.js js/bootstrap-scrollspy.js;\
31-
uglifyjs -o js/min/bootstrap-tabs.min.js js/bootstrap-tabs.js;\
32-
uglifyjs -o js/min/bootstrap-twipsy.min.js js/bootstrap-twipsy.js;\
33-
else \
34-
echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
35-
echo "You can install it by running: npm install uglify-js -g"; \
36-
fi
8+
#
9+
# BUILD DOCS
10+
#
11+
12+
docs: bootstrap
13+
zip -r docs/assets/bootstrap.zip bootstrap
14+
rm -r bootstrap
15+
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
16+
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
17+
node docs/build
18+
cp img/* docs/assets/img/
19+
20+
#
21+
# BUILD SIMPLE BOOTSTRAP DIRECTORY
22+
# lessc & uglifyjs are required
23+
#
24+
25+
bootstrap:
26+
mkdir -p bootstrap/img
27+
mkdir -p bootstrap/css
28+
mkdir -p bootstrap/js
29+
cp img/* bootstrap/img/
30+
lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
31+
lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
32+
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive
33+
lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.min.responsive
34+
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 > bootstrap/js/bootstrap.js
35+
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
36+
37+
#
38+
# WATCH LESS FILES
39+
#
3740

3841
watch:
39-
@@if test ! -z ${WATCHR}; then \
40-
echo "Watching less files..."; \
41-
watchr -e "watch('lib/.*\.less') { system 'make' }"; \
42-
else \
43-
echo "You must have the watchr installed in order to watch Bootstrap less files."; \
44-
echo "You can install it by running: gem install watchr"; \
45-
fi
46-
47-
.PHONY: build watch
42+
echo "Watching less files..."; \
43+
watchr -e "watch('less/.*\.less') { system 'make' }"
44+
45+
46+
.PHONY: dist docs watch

README.md

+16-27
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,6 @@ Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more
66
To get started -- checkout http://twitter.github.com/bootstrap!
77

88

9-
Usage
10-
-----
11-
12-
You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS into any new project and start cranking, or run LESS on your site and compile on the fly like a boss.
13-
14-
Here's what the LESS version looks like:
15-
16-
``` html
17-
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
18-
<script src="less.js" type="text/javascript"></script>
19-
```
20-
21-
Or if you prefer, the standard css way:
22-
23-
``` html
24-
<link rel="stylesheet" type="text/css" href="bootstrap.css">
25-
```
26-
27-
For more info, refer to the docs!
28-
29-
309
Versioning
3110
----------
3211

@@ -72,10 +51,10 @@ http://groups.google.com/group/twitter-bootstrap
7251
Developers
7352
----------
7453

75-
We have included a makefile with convenience methods for working with the bootstrap library.
54+
We have included a makefile with convenience methods for working with the Bootstrap library.
7655

77-
+ **build** - `make build`
78-
This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file.
56+
+ **build** - `make`
57+
This will run the less compiler on the bootstrap lib and regenerate the docs dir.
7958
The lessc compiler is required for this command to run.
8059

8160
+ **watch** - `make watch`
@@ -97,9 +76,19 @@ Authors
9776
+ http://github.com/fat
9877

9978

100-
License
79+
Copyright and license
10180
---------------------
10281

103-
Copyright 2011 Twitter, Inc.
82+
Copyright 2012 Twitter, Inc.
83+
84+
Licensed under the Apache License, Version 2.0 (the "License");
85+
you may not use this work except in compliance with the License.
86+
You may obtain a copy of the License in the LICENSE file, or at:
87+
88+
http://www.apache.org/licenses/LICENSE-2.0
10489

105-
Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
90+
Unless required by applicable law or agreed to in writing, software
91+
distributed under the License is distributed on an "AS IS" BASIS,
92+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
93+
See the License for the specific language governing permissions and
94+
limitations under the License.

0 commit comments

Comments
 (0)