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
XhmikosR
4bf0645060
Merge pull request #12977 from ZDroid/var
...
Rename generateRawFilesJs to generateRawFiles
2014-03-10 01:16:30 +02:00
Mark Otto
40ce6ca431
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-09 16:16:02 -07:00
Mark Otto
4883605624
Fix bad grunt merge and then G R U N T
2014-03-09 16:15:53 -07:00
XhmikosR
5f0c0c9ed1
Merge pull request #12975 from ZDroid/parens
...
Remove redundant parens
2014-03-10 01:15:52 +02:00
mrmrs
fc74ee5f67
Changes compiled assets after changing mixins.less
2014-03-09 16:15:35 -07:00
mrmrs
aedee95dbf
Adds basic table of contents for mixins.less. You know for the kids.
2014-03-09 16:13:37 -07:00
Mark Otto
b263a0197b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
Gruntfile.js
2014-03-09 16:11:04 -07:00
Mark Otto
2f7b04a192
Reorder the Gruntfile a bit
2014-03-09 16:09:36 -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
aacafb2d5c
Fixes #12892 : Link to one of the SO articles on Bootstrap modals and YouTube
2014-03-09 16:03:46 -07:00
Mark Otto
15d4494038
Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert
2014-03-09 15:32:36 -07:00
Mark Otto
4d870af2aa
Fixes #12487 : Document required use of position relative for scrollspy
2014-03-09 15:19:26 -07:00
Mark Otto
ce634a0ba7
Document shitty situation of multiple .navbar-right classes in #12951
2014-03-09 14:49:52 -07:00
Mark Otto
f3dcd4dba4
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-09 14:39:52 -07:00
Mark Otto
9920251ca8
Document #12476 bug in the wall of bugs
2014-03-09 14:17:18 -07:00
Mark Otto
bc7e6a3f20
Merge pull request #12989 from twbs/bower_ignore
...
Don't ignore every dot file in Bower
2014-03-09 13:52:24 -07:00
Mark Otto
27da9728bc
grunt
2014-03-09 13:50:55 -07:00
Mark Otto
29f23576ee
Merge pull request #12679 from twbs/sr-only-focusable
...
add .sr-only-focusable
2014-03-09 12:39:29 -07:00
Mark Otto
d8bc65b9d0
Merge branch 'master' into sr-only-focusable
2014-03-09 12:32:13 -07:00
Mark Otto
1caeca3e01
Don't ignore every dot file in Bower
2014-03-09 12:31:42 -07:00
XhmikosR
9d027d2bee
Remove unneeded quotes.
2014-03-09 11:10:52 +02:00
Mark Otto
5e6d16ef4d
grunt
2014-03-08 21:05:23 -08:00
Mark Otto
54b35d00a4
document position relative firefox bug; cleanup some stuff in the browser bugs page
2014-03-08 20:53:16 -08: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
e4d13e238d
Merge pull request #12983 from twbs/fat-9836
...
fixes #9836
2014-03-08 20:10:04 -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
90eb52495b
Merge pull request #12982 from twbs/fat-9342
...
fix #9342
2014-03-08 19:38:17 -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
7c9a58f3d9
Merge pull request #12976 from ZDroid/comment
...
Update .hide-text() comment
2014-03-08 15:36:07 -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
Mark Otto
c7984d41ca
Merge pull request #12980 from ZDroid/config-yml-quotes
...
Remove redundant _config.yml quotes
2014-03-08 15:08:36 -08:00
Zlatan Vasović
dd9946e919
Remove redundant _config.yml quotes
2014-03-08 23:03:28 +01:00
Zlatan Vasović
e4c9492ad9
Rename generateRawFilesJs to generateRawFiles
2014-03-08 10:54:41 +01:00
Zlatan Vasović
4b53ea30b4
Update .hide-text() comment
2014-03-08 10:49:48 +01:00
Zlatan Vasović
cbec164a50
Remove redundant parens
2014-03-08 10:44:24 +01:00
Chris Rebert
41b2868906
Merge pull request #12972 from twbs/cleaner-shrinkwrap
...
Exclude `resolved` from npm shrinkwrap to avoid irrelevant changes
2014-03-07 21:20:06 -08:00
Chris Rebert
c8379ff2c7
S H R I N K W R A P
2014-03-07 16:20:53 -08:00
Chris Rebert
51b825d6b3
fix #12959
2014-03-07 16:05:46 -08:00
Mark Otto
30bbab06d8
Merge pull request #12962 from BBosman/transitions-count
...
Add transition-timing-function mixin to docs
2014-03-07 14:52:41 -08:00
Mark Otto
538b3ca06f
Merge pull request #12969 from ZDroid/badge-mixin
...
Improve badges mixinability
2014-03-07 14:41:55 -08:00
Mark Otto
d2236239f0
Merge pull request #12970 from ZDroid/package.json-pa
...
Remove ./ from package.json paths
2014-03-07 14:13:35 -08:00
Mark Otto
8a1856d17d
Merge pull request #12971 from ZDroid/config-yml
...
Remove ./ from _config.yml paths
2014-03-07 14:12:48 -08:00
