Mark Otto
b3f30bb70e
grunt
2014-03-16 20:46:00 -07:00
Mark Otto
43cf003f9a
Update gruntfile to point to new customizer nav, run grunt
2014-03-16 20:40:30 -07:00
Mark Otto
b7ab799824
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs/dist/js/bootstrap.min.js
2014-03-16 19:06:17 -07:00
Mark Otto
2a43e7e78a
Break up docs into includes
2014-03-16 19:03:53 -07:00
fat
dd7cab84f6
build
2014-03-16 18:44:58 -07:00
XhmikosR
d4a4bbb729
Update dependencies.
2014-03-12 20:22:22 +02:00
XhmikosR
f750f7e448
Run usebanner before cssmin.
2014-03-11 19:49:11 +02: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
a83ca38713
Fixes #13003 : Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin
2014-03-10 16:41:56 -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
b0bc9ef815
Add consistent newline at end of files in less/mixins
2014-03-09 23:44:11 -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
a7b0fa7ebf
ugh grunt
2014-03-09 22:28:29 -07:00
Mark Otto
213860408e
moar grunt
2014-03-09 22:19:02 -07:00
Mark Otto
30deb5697c
grunt
2014-03-09 22:06:14 -07:00
Mark Otto
ccb17f110d
Merge branch 'master' into fix-8869
2014-03-09 22:01:38 -07:00
Mark Otto
2f955907f9
Fixes #12669 : Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs
2014-03-09 17:12:39 -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
XhmikosR
68b3e3f3be
Merge pull request #12986 from twbs/unneeded-quotes
...
Remove unneeded quotes.
2014-03-10 01:07:14 +02:00
Mark Otto
27da9728bc
grunt
2014-03-09 13:50:55 -07:00
XhmikosR
9d027d2bee
Remove unneeded quotes.
2014-03-09 11:10:52 +02:00
Mark Otto
ef5d8e98e2
Merge branch 'master' into sr-only-focusable
...
Conflicts:
dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
Mark Otto
b8ab0c66ac
grunt
2014-03-08 20:03:31 -08:00
fat
4d96e69a55
fixes #9836
2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671
grunt
2014-03-08 19:32:40 -08:00
fat
e9cced72fd
fix #9342
2014-03-08 19:20:47 -08:00
Mark Otto
4b6e1b6754
grunt dist
2014-03-08 17:40:58 -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
Zlatan Vasović
d08bbdc6ec
Reorganize docs assets
2014-03-07 17:37:23 +01:00
Mark Otto
0143e38a67
Merge branch 'master' into document_popover_focus
...
Conflicts:
docs/assets/js/docs.min.js
2014-03-07 01:30:28 -08:00
Mark Otto
e25dacba14
Merge branch 'master' into typography-example-updates
...
Conflicts:
docs/assets/js/customize.min.js
2014-03-07 01:10:16 -08:00
Mark Otto
ac4dd30460
G R U N T G R U N T
2014-03-07 01:08:29 -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
fe0d5959d2
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-07 00:28:29 -08:00
Mark Otto
5bd2799978
G R U N T
2014-03-07 00:26:38 -08:00
XhmikosR
24ec60e6e5
Merge pull request #12931 from twbs/line-endings
2014-03-07 10:24:32 +02:00
Mark Otto
c03b8f1f0f
Merge branch 'master' into pr/12670
2014-03-07 00:23:52 -08:00
