0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

8984 Commits

Author SHA1 Message Date
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
Zlatan Vasović
3bdaa831e9 Remove ./ from _config.yml paths 2014-03-07 23:11:59 +01:00
Zlatan Vasović
f9a56c28db Remove ./ from package.json paths 2014-03-07 23:07:38 +01:00
Chris Rebert
0d0cbb87ee rm #1969 from browser bugs list per outcome of investigation 2014-03-07 11:08:05 -08:00
Zlatan Vasović
0f3b176a76 Improve badges mixinability 2014-03-07 18:54:53 +01:00
XhmikosR
91e57e2738 Move license to the top of the file. 2014-03-07 18:59:43 +02:00
Chris Rebert
b9a0d1e4cd Merge pull request #12505 from ZDroid/js-cs-hint
Reorganize docs assets
2014-03-07 08:47:09 -08:00
XhmikosR
4356e6c6bd Merge pull request #12961 from BBosman/csscomb
Do csscomb earlier in build phase
2014-03-07 18:43:08 +02:00
Zlatan Vasović
d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
Bas Bosman
de27e729da Do csscomb earlier in build phase 2014-03-07 13:39:07 +01:00
XhmikosR
6f9e3f0d23 Fix typo. 2014-03-07 13:25:59 +02:00
Bas Bosman
acdc053ee3 Add transition-timing-function mixin to docs 2014-03-07 11:28:48 +01:00
Mark Otto
864a18f95e Merge pull request #12688 from twbs/document_popover_focus
Document popover focus
2014-03-07 01:31:01 -08:00
Mark Otto
0b8d27a125 fix derped html 2014-03-07 01:30:38 -08: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
1f148427de Merge pull request #12891 from ZDroid/bower-json-paths
Remove ./ from bower.json paths
2014-03-07 01:27:56 -08:00
Mark Otto
0b06d5969b Merge pull request #12957 from BBosman/rename-mixin
Fix transition-timing-function mixin
2014-03-07 01:15:33 -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