Commit Graph

3607 Commits

Author SHA1 Message Date
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto 9a6b7ab375 grunt 2014-01-30 08:14:18 -08:00
Chris Riddell d002f0459d its an email input 2014-01-30 23:14:05 +10:30
Mark Otto d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Mark Otto d2f1887bb5 Merge branch 'master' into pr/12388
Conflicts:
	dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto 9195d8e8eb Follow up to #11655: don't reset opacity on disabled buttons 2014-01-29 21:57:44 -08:00
Mark Otto 7ba2eede4e fix css url 2014-01-29 21:44:36 -08:00
Mark Otto 80ef14a11a Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 21:44:01 -08:00
Mark Otto d631e0b92d Fix #12422: Reset height on multiple select in input size mixin 2014-01-29 21:34:10 -08:00
Mark Otto 545c957f17 Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over 2014-01-29 21:23:23 -08:00
Zlatan Vasović 00f062fc7e Rename pack.min.css to docs.min.css to match with docs.min.js 2014-01-29 20:50:10 +01:00
Mark Otto 01dabd3391 Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
2014-01-28 10:57:31 -08:00
Mark Otto a9a4d81730 grunt 2014-01-28 10:08:40 -08:00
Julian Thilo 3a62811bbd Update javascript.html 2014-01-28 00:01:10 +01:00
Julian Thilo 0a5cb2f908 Fix typo 2014-01-27 23:07:14 +01:00
Mark Otto b7ac009a52 Remove #8350's reset for number inputs since Normalize fixes those upstream 2014-01-27 12:25:39 -08:00
Mark Otto 400720d00b Remove optgroup resets from #7611 since Normalize fixes those upstream 2014-01-27 12:24:35 -08:00
Mark Otto 6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto 45ea456468 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-27 09:42:33 -08:00
Mark Otto e08e871f01 document id requirement in carousels per #12393 2014-01-27 09:24:51 -08:00
Quy Ton 5c1852fb74 Change positioning reference from left to right in affix's example. 2014-01-27 09:17:57 -08:00
Mark Otto 16fd8cd01e Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
2014-01-26 19:15:31 -08:00
Chris Rebert 1a36e4fa1e docs & comments: v3.1 => v3.1.0 2014-01-26 17:48:15 -08:00
Chris Rebert 602e5f8f11 mark .box-shadow() mixin as deprecated; fixes #12396 2014-01-26 17:44:01 -08:00
Chris Rebert 86a5846ada Merge pull request #12378 from andrewdisley/patch-1
Fix #10348: Customizer dependencies
2014-01-25 16:30:02 -08:00
Julian Thilo 0cbfdd19bd Add link to German translation and reorder links 2014-01-25 16:08:15 +01:00
Andrew Disley a1b0bb7a10 Fix #10348: Customizer dependencies 2014-01-25 12:35:46 +00:00
Mark Otto 6d090e243d Merge pull request #12366 from Quy/master
Change a word.
2014-01-24 22:36:05 -08:00
Julian Thilo af1ba5cf74 Clarify nesting in grid example 2014-01-25 01:58:54 +01:00
Quy Ton 4b5991586d Change a word. 2014-01-24 11:24:50 -08:00
Quy Ton da86f6fbbb Remove Twitter from tweet button 2014-01-24 10:37:12 -08:00
Mark Otto 64e8132426 Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements 2014-01-24 11:55:59 -06:00
Mark Otto 44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06:00
Chris Rebert b9d1ae092f add ID to "Box sizing" section of Getting Started docs 2014-01-23 17:01:43 -08:00
Mark Otto f748390cf5 Follow-up to #12250: remove remaining page margins for print 2014-01-22 21:51:23 -06:00
Mark Otto 08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06:00
Mark Otto b945491426 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:15:25 -06:00
Mark Otto 7b24a3b99c Fixes #12344: Update docs to show workaround for using button element with justified button groups 2014-01-22 21:15:17 -06:00
Chris Rebert 6d08763136 add docs note to address #12078 2014-01-22 17:28:00 -08:00
Julian Thilo 494014babe No more lists. 2014-01-22 19:04:19 +01:00
Julian Thilo 2022e15aa8 Gone, gone. 2014-01-22 17:00:09 +01: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
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
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
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 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 6b8d4e9c76 clarify Grunt task licensing 2014-01-20 16:56:24 -08:00