Nicolas Dudebout
25803a966b
Replaces some @echo recipes by @printf.
...
The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:
- Makefile calls /bin/sh to execute a command
- in Mac OS X, /bin/sh is a link to bash
- in Mac OS X, bash is compiled with --enable-strict-posix-default
Therefore, the echo command does not have the -n argument.
printf on the other hand is a builtin function that works well on Mac OS X and Linux.
2013-01-14 08:58:16 -05:00
Nicolas Dudebout
5204f206b9
Splits the progress @echo statements in the Makefile.
2013-01-14 08:57:44 -05:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.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-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
818c56f078
rewrite makefile to make a bit more "efficient" + rebuild
2012-12-21 17:42:24 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.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-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
fca35c0dba
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Kyle A. Matheny
fe8df5022b
Update Makefile
...
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto
c0bbe1692c
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
2012-11-05 18:27:25 -08:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
Mark Otto
a56de2b84f
Merge branch 'glyphicons_font' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
2012-11-03 16:15:54 -07:00
Mark Otto
1477e081d4
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
72198a59c0
removing glyphicons images, swapping in new icon font with new classes
2012-11-02 01:20:06 -07:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
fat
31c1eba51b
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
...
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat
92e7f166e7
remove haunt, remove bootstrap dir, add bower support
2012-10-29 21:27:34 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Mark Otto
de6ec034db
single CSS file for all css, including responsive
2012-09-30 23:24:07 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
♒∆✝
9d890a8412
Merge pull request #4810 from mainerror/2.1.1-wip
...
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -07:00
Mark Otto
bf590d8c81
fixes #4958 : add version to minified js
2012-09-04 11:13:08 -07:00
Octavian Damiean
a976a1583c
Added 'clean' directive to the make file.
2012-08-29 13:24:00 +02:00
Jacob Thornton
320b75de63
add affix to zip
2012-08-20 23:13:43 -07:00
Mickael Perraud
6a1521327b
Add affix.js to javascript compilation
2012-08-15 10:56:52 +02:00
Jacob Thornton
77dea2c5eb
change haunt to write
2012-07-22 13:00:17 -07:00
Jacob Thornton
6c2fa9430c
add haunt w/ issue guideline spec
2012-07-22 12:57:39 -07:00
Jacob Thornton
e659dc7e1b
Merge branch '2.0.3-wip'
...
Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton
b8b1ffde05
hr to var in makefil
2012-04-23 04:16:27 -07:00
Jacob Thornton
03f78f7a60
run qunit tests in phantomjs for travis-ci
2012-04-19 17:34:07 -07:00
Jacob Thornton
1160935446
make a few changes to package.json (add make test to makefile)
2012-04-19 16:38:43 -07:00
Jacob Thornton
f89394b8ef
make build prettier - hopefully this works, maybe some makefile bro's can improve
2012-04-18 22:49:31 -07:00
Jacob Thornton
edb52a82d8
make bootstrap compile with Recess instead of Less
2012-04-18 16:16:42 -07:00
Jacob Thornton
6cf9906a60
build bootstrap.js and bootstrap.min.js into docs
2012-04-15 17:03:33 -07:00
Jacob Thornton
6506ede632
add bootstrap + bootstrap.min.js to gh-pages for @remy
2012-04-15 16:45:13 -07:00
Jacob Thornton
e985681758
add zip to git ignore, and fix gh-pages make
2012-04-15 00:19:25 -07:00
Jacob Thornton
2a6894d834
simplify make - move zipping to gh-pages only
2012-04-15 00:16:09 -07:00
Jacob Thornton
c262ead6ed
change comments to preserve for yui
2012-04-14 23:51:08 -07:00
Jacob Thornton
c7dc4cc573
change position of var in dropdown + cleanup makefile vars
2012-04-14 22:43:36 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Mark Otto
5591a9b966
use yui-compress by default instead of regular compress
2012-04-07 14:56:37 -07:00
Mark Otto
95cb6f07a8
Merge branch 'zerkms-master' into 2.0.2-wip
...
Conflicts:
Makefile
2012-03-11 17:38:23 -07:00
Jonathan Maron
aa8e6b081c
Fixed double copy action in Makefile.
2012-03-09 07:38:14 +01:00
Jacob Thornton
1562381114
remove non existent dist dir from phony makefil
2012-03-08 11:42:12 -08:00
Jacob Thornton
bcef12dfcc
add version to min js
2012-03-08 11:39:00 -08:00
Jacob Thornton
e1deb4e767
fix makefile to reset zips
2012-02-01 22:27:46 -08:00
Mark Otto
54bfdf1183
fix the makefile
2012-02-01 18:24:41 -08:00
Jacob Thornton
59016d2198
only add the anyalytics to production
2012-02-01 16:38:58 -08:00
