aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2013-07-26Replace Makefile with GruntJSJohn-Philip Johansson1-107/+0
A rebase (against soon-to-be 3.0.0-rc.1) & squash of https://github.com/twbs/bootstrap/pull/7786 AKA https://github.com/twitter/bootstrap/pull/7786 originally by @seriema @mokkabonna @jojohess Rebased by @cvrebert
2013-07-26fix makefile error thingfat1-1/+1
2013-07-25fixes #8560fat1-1/+1
2013-07-18Add minified CSS to dist folderMark Otto1-0/+2
2013-07-18finish flattening repo structure; add dist folder of compiled css/jsMark Otto1-8/+8
2013-06-28removing useless spacePierre Guilbert1-1/+1
2013-06-28removing bootstrap-fonts rule in Makefile for bootstrap rulePierre Guilbert1-1/+1
2013-06-27fix makefileMark Otto1-13/+1
2013-05-21remove make gh-pages commandMark Otto1-12/+0
2013-05-21Fixes #7943: typo in makefileMark Otto1-1/+1
2013-05-16remove dumb assets update makefile wassupfat1-1/+6
2013-05-16a bunch javascript junkfat1-2/+2
2013-04-11Remove BOOTSTRAP_RESPONSIVE_LESS in css compilelucaflisi1-2/+0
No more needed in Bootstrap 3
2013-02-17remove duplicate done text; change label on docs prep stepMark Otto1-7/+7
2013-02-17correct versionMark Otto1-1/+1
2013-02-17Resolve conflictsMark Otto1-16/+22
2013-02-14Update makefileMark Otto1-15/+13
2013-02-13update makefile to work again; gitignore the compiled docs _gh_pages folder; ↵Mark Otto1-18/+17
test makefile with darkened navbar active bg
2013-02-12update makefile to work given nuked docs dirMark Otto1-13/+13
2013-02-12convert to jekyllMark Otto1-5/+5
2013-02-02Verion number in JS makefileMark Otto1-1/+1
2013-01-14Changes some more commands to use the local npm install.Nicolas Dudebout1-4/+4
2013-01-14Allows the user to set different source and destination in Makefile.Nicolas Dudebout1-2/+2
A user can use the following command to determine where to copy the resulting css file: $ BOOTSTRAP=<my-path> make
2013-01-14Modifies the Makefile to use local npm install **when available**Nicolas Dudebout1-5/+6
The change introduced in 5bd8cdca9 was: - partial, as not all the command were translated - preventing the use of a global npm installation
2013-01-14Moves one @printf statement to be more accurate.Nicolas Dudebout1-1/+1
2013-01-14Replaces some @echo recipes by @printf.Nicolas Dudebout1-4/+4
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-14Splits the progress @echo statements in the Makefile.Nicolas Dudebout1-4/+8
2013-01-13Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto1-8/+35
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
2012-12-22Version bumpMark Otto1-1/+1
2012-12-21rewrite makefile to make a bit more "efficient" + rebuildfat1-9/+34
2012-12-20Merge branch '2.2.3' into 3.0.0-wipMark Otto1-8/+8
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-19remove inside support from tooltip + fix tooltip svg support + change ↵fat1-10/+10
makefile to rely on local npm install
2012-12-10Version bumpMark Otto1-1/+1
2012-11-30version bump to 3.0Mark Otto1-1/+1
2012-11-30Merge branch '2.2.2-wip' into exploratoryMark Otto1-2/+2
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-28Update MakefileKyle A. Matheny1-2/+2
Fixed both instances of uglifyjs usage.
2012-11-05Merge branch '2.2.2-wip' into exploratoryMark Otto1-1/+1
Conflicts: docs/assets/css/bootstrap.css less/navbar.less less/variables.less
2012-11-05version bumpMark Otto1-1/+1
2012-11-03Merge branch 'glyphicons_font' into exploratoryMark Otto1-3/+3
Conflicts: docs/assets/css/bootstrap.css docs/assets/css/docs.css less/sprites.less
2012-11-02Merge branch '2.2.2-wip' into exploratoryMark Otto1-8/+1
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-02removing glyphicons images, swapping in new icon font with new classesMark Otto1-3/+3
2012-10-302.2.1 - hotfix for carouselfat1-1/+1
2012-10-29Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wipfat1-1/+1
Conflicts: bootstrap/css/bootstrap.css bootstrap/css/bootstrap.min.css
2012-10-29remove haunt, remove bootstrap dir, add bower supportfat1-7/+0
2012-10-29v2.2.0 instead of v2.1.2Mark Otto1-1/+1
2012-09-30single CSS file for all css, including responsiveMark Otto1-5/+0
2012-09-05version bump to get this startedMark Otto1-1/+1
2012-09-04Merge pull request #4810 from mainerror/2.1.1-wip♒∆✝1-0/+7
Makefile misses a 'clean' directive
2012-09-04fixes #4958: add version to minified jsMark Otto1-1/+1
2012-08-29Added 'clean' directive to the make file.Octavian Damiean1-0/+7
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 22:22:14 +0000