Mark Otto
ce013440e7
grunt
2014-03-24 19:31:12 -07:00
Mark Otto
c6648d58f0
grunt
2014-03-24 19:09:30 -07:00
Mark Otto
43cf003f9a
Update gruntfile to point to new customizer nav, run grunt
2014-03-16 20:40:30 -07:00
fat
dd7cab84f6
build
2014-03-16 18:44:58 -07:00
Mark Otto
6f13a14e4b
moar grunt
2014-03-10 16:51:53 -07:00
Mark Otto
74c391b9ad
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/dist/css/bootstrap.css.map
2014-03-10 16:43:01 -07:00
Mark Otto
552f170e3c
even more grunt
2014-03-10 13:31:34 -07:00
Mark Otto
a36643dd33
Merge branch 'master' into modular-the-mixins
...
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
2014-03-10 00:08:29 -07:00
Mark Otto
564b79ca87
grunt
2014-03-09 23:58:29 -07:00
mrmrs
38d0908aff
Add recompiled assets after nuking toc in mixins.less.
2014-03-09 23:51:38 -07:00
mrmrs
2f380a9683
Merge branch 'master' into modular-the-mixins
...
* master:
Replace some images on the Carousel example with some base64 encoded 1x1 gifs
ugh grunt
moar grunt
mo copy
http://www.youtube.com/watch?v=AJWtLf4-WWs
grunt
Copy change
fix grammar in comment in forms.less
Fixes #12759
Fixes #12738
replace .visible-{size} with .visible-{size}-{display} ; fixes #8869
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/mixins.less
2014-03-09 23:28:08 -07:00
mrmrs
348b7de7f7
Break mixins.less up into smaller modules.
...
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.
FIXES #12994
2014-03-09 23:18:48 -07:00
Mark Otto
213860408e
moar grunt
2014-03-09 22:19:02 -07:00
Mark Otto
b69e4d636a
Reorganize mixins and G R U N T
2014-03-09 16:50:30 -07:00
mrmrs
0b415c6099
Merge branch 'master' into mixin-table-of-contents
...
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892 : Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
2014-03-09 16:40:40 -07:00
mrmrs
71e9902d9a
Adjusts some section titles to be more explicit.
...
FIXES #12992
2014-03-09 16:25:27 -07:00
Mark Otto
4883605624
Fix bad grunt merge and then G R U N T
2014-03-09 16:15:53 -07:00
mrmrs
fc74ee5f67
Changes compiled assets after changing mixins.less
2014-03-09 16:15:35 -07:00
Mark Otto
ef5d8e98e2
Merge branch 'master' into sr-only-focusable
...
Conflicts:
dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
fat
4d96e69a55
fixes #9836
2014-03-08 19:45:38 -08:00
fat
e9cced72fd
fix #9342
2014-03-08 19:20:47 -08:00
Mark Otto
7c3881086f
Fix comment
2014-03-08 17:11:48 -08:00
Mark Otto
bcfb27b962
grunt
2014-03-08 16:11:24 -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
67c747a109
grunt
2014-03-08 15:30:18 -08:00
mrmrs
d1d5d90413
Fixes #12748
2014-03-07 00:59:22 -08:00
Mark Otto
d44e98b34d
G R U N T
2014-03-07 00:50:28 -08:00
Mark Otto
6452b409aa
grunt for days
2014-03-07 00:23:22 -08:00
Mark Otto
12c619f5b9
Merge branch 'master' into boulox-responsive-embed
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-03-06 22:40:25 -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
mrmrs
4868096dbd
Fixes #12934
2014-03-06 21:05:29 -08:00
Mark Otto
8526adf69c
grunt
2014-03-06 20:33:10 -08:00
Mark Otto
026e2f8d30
Grunt after merging #12863
2014-03-04 14:24:09 -08:00
Mark Otto
8f2a787c36
grunt
2014-03-04 14:20:48 -08:00
Mark Otto
1399497a02
grunt
2014-03-04 00:30:40 -08:00
XhmikosR
e5affbfa0a
Run grunt.
2014-03-01 20:58:53 +02:00
Supergibbs
49094844ac
Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694
2014-02-21 20:51:06 -08:00
Mark Otto
4b622c60c1
grunt
2014-02-21 17:42:25 -08:00
Mark Otto
385fb68981
grunt
2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427
v3.1.1 bump
2014-02-13 01:12:26 -08:00
Mark Otto
8551f42ae2
Merge branch 'master' into pr/12412
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Mark Otto
728067b586
Update Glyphicons
2014-02-10 21:28:05 -08:00
Mark Otto
3350c73666
http://www.youtube.com/watch?v=YQwYNca4iog
2014-02-10 20:52:20 -08:00
Mark Otto
3fc7a4cffa
grunt with new mixins
2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9
grunt
2014-02-08 16:13:30 -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
58bf3f9432
grunt after last commits
2014-01-31 13:40:32 -08:00
Mark Otto
1409cde7e8
Bump versions, run grunt
2014-01-30 08:30:37 -08:00
Mark Otto
d4b1bfd667
grunt
2014-01-29 22:44:06 -08:00
Chris Rebert
336f5f1dce
rename raw-files.js to raw-files.min.js
...
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
2014-01-19 22:29:51 -08:00
