Commit Graph

8188 Commits

Author SHA1 Message Date
Mark Otto e29a3b65cd Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 15:37:11 -06:00
Mark Otto d1f69d4a7e scope styles to masthead, not homepage 2014-01-22 15:37:05 -06:00
Julian Thilo 494014babe No more lists. 2014-01-22 19:04:19 +01:00
Julian Thilo 57597c4761 Merge pull request #12340 from browserstack/update_bs_runner
Update browserstack-runner package
2014-01-22 08:46:41 -08:00
Julian Thilo 2022e15aa8 Gone, gone. 2014-01-22 17:00:09 +01:00
Rahul Nawani 6c7db9d56e update browserstack runner package 2014-01-22 21:15:55 +05:30
Chris Rebert 81b234e74a Merge pull request #12334 from Quy/master
Reorder lead/nav of About docs page
2014-01-21 22:18:44 -08:00
Quy Ton c08aef1655 Reorder lead info of About docs page 2014-01-21 22:12:44 -08:00
Quy Ton e5c7c2acc1 Reorder nav of About docs page 2014-01-21 22:02:54 -08:00
Mark Otto 06dcf91364 Merge pull request #12326 from twbs/navbar-var
add @navbar-collapse-max-height Less variable
2014-01-21 20:50:26 -08:00
Mark Otto 109ba82eed Merge pull request #12327 from twbs/about-ordering
reorder sections of About docs page
2014-01-21 20:15:21 -08:00
Chris Rebert 068d7a11f9 reorder sections of About docs page
most folks are probably more interested in History and Team than Branding
2014-01-21 10:28:54 -08:00
Chris Rebert 67271a18ac add @navbar-collapse-max-height Less variable 2014-01-21 10:23:57 -08:00
Julian Thilo 7938134fd1 Merge pull request #12321 from coliff/patch-3
Update index.html
2014-01-21 03:15:49 -08:00
Christian ae579e950b Update index.html
This is very minor, but to help encourage best practises it'd be best to have the input type 'email' for this email input example instead of 'text'
2014-01-21 18:36:48 +09:00
Chris Rebert c658e4e926 fix typo in README 2014-01-21 00:55:56 -08:00
Mark Otto cd78b43185 Merge pull request #12308 from twbs/fix-12298
Fix #12298
2014-01-20 20:15:37 -08:00
Mark Otto e4f33a91d9 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-20 22:12:02 -06:00
Mark Otto 317aa8092d spacing 2014-01-20 22:11:51 -06:00
Chris Rebert ebc4f998dc Merge pull request #12318 from twbs/fscking-customizer
Template the customizer's nav sidebar too
2014-01-20 18:09:59 -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 5d35c4909c Merge pull request #12282 from XhmikosR/grunt-contrib-uglify
Update grunt-contrib-uglify dependency.
2014-01-20 17:28:42 -08:00
Chris Rebert 8a1f4426a2 Merge pull request #12317 from twbs/grunt-task-license
clarify Grunt task licensing
2014-01-20 16:58:11 -08:00
Chris Rebert 6b8d4e9c76 clarify Grunt task licensing 2014-01-20 16:56:24 -08:00
Chris Rebert 5cc3c62e30 slap a lang attr on <html> in the Getting Started basic template
for consistency with docs/examples/starter-template/index.html
2014-01-20 16:53:31 -08:00
Chris Rebert 50000b5930 nitpick phrasing 2014-01-20 15:05:25 -08:00
Chris Rebert f4a916d351 upgrade #callout-navbar-overflow from info to warning 2014-01-20 15:02:48 -08:00
Julian Thilo 4ec861316f fix markup typo, duh 2014-01-21 00:00:52 +01:00
Julian Thilo 4552bcf66f fix #12311 2014-01-20 23:51:13 +01:00
Julian Thilo 4a36ecaac6 fix #12314 2014-01-20 23:36:52 +01:00
Chris Rebert 14baf4ef27 Merge pull request #12303 from twbs/doc-s3
document S3 cache more fully
2014-01-20 13:56:58 -08:00
Chris Rebert ece15cb010 Merge pull request #12307 from twbs/bye-site-baseurl
docs: use relative URLs instead of site.baseurl
2014-01-20 13:55:07 -08:00
nkav 4380ca4348 Corrected tag for Alert JS animation example from <a> to <button>
Also removed href attribute and added type="button"
2014-01-20 13:46:41 -08:00
XhmikosR 9818ad532e Update grunt-contrib-uglify dependency. 2014-01-20 09:37:02 +02:00
Chris Rebert 79487ba499 fix #12298 2014-01-19 23:07:32 -08:00
Chris Rebert f59573db0d docs: use relative URLs instead of site.baseurl 2014-01-19 22:50:09 -08:00
Chris Rebert 4120aadd68 Merge pull request #12306 from twbs/raw-files.min.js
rename raw-files.js to raw-files.min.js
2014-01-19 22:36:08 -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
Chris Rebert 06a7bdd0b0 grunt build-raw-files dist 2014-01-19 22:27:01 -08:00
Chris Rebert adda5d55c6 Merge pull request #12304 from Quy/master
Replace page.base_url with relative url
2014-01-19 22:21:29 -08:00
Quy Ton 0d153fa643 Replace page.base_url with relative url 2014-01-19 21:03:17 -08:00
Chris Rebert 6f1236f81a document S3 cache more fully; fixes #12289 2014-01-19 18:48:35 -08:00
Chris Rebert 0349fe0f0b Merge pull request #12295 from ZDroid/types
Improve grunt config and vars
2014-01-19 15:43:52 -08:00
Chris Rebert 937e067a27 grunt build-customizer-vars-form 2014-01-19 15:28:30 -08:00
Chris Rebert 04cfca25af s3_cache.py: fix name in USAGE message 2014-01-19 15:12:09 -08:00
Zlatan Vasović 956064ec56 Improve grunt config and vars 2014-01-19 22:41:01 +01:00
Julian Thilo a77fba3c37 Merge pull request #12302 from Quy/master
More "LESS" to "Less" changes
2014-01-19 13:35:06 -08:00
Quy Ton 3e9ba3f671 More "LESS" to "Less" changes 2014-01-19 13:27:51 -08:00
Julian Thilo 2a75e559f6 Merge pull request #12297 from Quy/master
Additional changes to #12275 and #12292
2014-01-19 08:15:10 -08:00
Quy Ton f2d37ccc23 Additional changes to #12275 and #12292 2014-01-19 07:41:14 -08:00