0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

32 Commits

Author SHA1 Message Date
Mark Otto
86828fcd3d Some secondary button border action 2014-09-17 18:10:28 -07:00
Mark Otto
9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
Mark Otto
6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto
1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto
4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto
9096c20021 grunt 2014-08-04 14:05:12 -07:00
Mark Otto
fecbaca907 grunt some more things, rebuild customizer nav 2014-07-12 18:11:07 -07:00
Mark Otto
5cfde0d3a5 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less
2014-07-12 16:15:45 -07:00
Mark Otto
717a50ce19 grunt 2014-07-12 15:37:13 -07:00
Mark Otto
93a7421f2c .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
Mark Otto
d55462fae8 grunt 2014-07-05 20:10:44 -07:00
Mark Otto
4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
Mark Otto
d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto
11cf54f9df grunt 2014-06-18 18:22:11 -07:00
Chris Rebert
98acc69219 fix #13360 by making deprecation notices visible in customizer 2014-04-17 18:43:05 -07:00
Zlatan Vasović
1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Mark Otto
7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto
03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Mark Otto
6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
Mark Otto
df3eb66ede Merge branch 'master' into popovers-use-radii-var
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-06 21:44:46 -08:00
Mark Otto
c8614c0f15 Merge branch 'master' into pr/12490
Conflicts:
	less/list-group.less
2014-03-06 21:32:52 -08:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
Chris Rebert
f27b864f7b grunt build-customizer-html 2014-02-25 17:28:16 -08:00
Mark Otto
3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto
b683433f67 grunt 2014-02-08 15:44:13 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto
d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Chris Rebert
3de48d29f5 fix #12280 by templating the customizer's nav sidebar too
The customizer is such a PITA.
2014-01-20 18:06:16 -08:00
Chris Rebert
937e067a27 grunt build-customizer-vars-form 2014-01-19 15:28:30 -08:00
Chris Rebert
d8c87ddc28 fix #12277
Thanks to @Quy for pointing these out.
2014-01-17 14:28:01 -08:00
Chris Rebert
db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095
also updates variables file organization (courtesy @mdo)
2014-01-08 12:41:51 -08:00