root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
14,058 Commits 111 Branches 92 Tags 667 MiB
Commit Graph

14058 Commits

Author SHA1 Message Date
Mark Otto b03684d04c Merge pull request #19102 from twbs/v4-center-utils 
v4: Drop .center-block for new-ish .m-x-auto
 2016-02-06 16:45:57 -08:00
Mark Otto 1285ec34fa Merge pull request #18488 from vsn4ik/v4-use-mixin-for-text-muted 
Use text-emphasis mixin for .text-muted
 2016-02-06 16:30:07 -08:00
Mark Otto 4be6b91467 Fixes #18562: Disable Hound for Ruby 2016-02-06 16:07:24 -08:00
Mark Otto 442277ddce Merge branch 'v4-dev' into v4-center-utils 2016-02-06 15:58:40 -08:00
Mark Otto 856e217574 migration notes for the text utils changes 2016-02-06 15:56:33 -08:00
Mark Otto 27ba4beb22 cross ref the type utils in the type docs 2016-02-06 15:53:10 -08:00
Mark Otto fc6c593bec rogue line break 2016-02-06 15:50:19 -08:00
Mark Otto b72e4ed8d6 add note to migration docs 2016-02-06 15:41:30 -08:00
Mark Otto c59dbe56fe Drop .center-block for .m-x-auto 
- Both classes do about the same thing, but with different names
- Clarifies docs for .m-x-auto requiring a fixed width block element for it to work
- Add missing heading for clearfix section in docs (unrelated)
 2016-02-06 15:40:25 -08:00
Mark Otto 612b824ae0 grunt 2016-02-06 15:32:03 -08:00
Mark Otto e06d6365f8 Strip out .err from our syntax highlighting styles because it fucks up our placeholders in code snippets 2016-02-06 15:32:00 -08:00
Mark Otto 40c3be90ca grunt 2016-02-06 15:20:08 -08:00
Mark Otto 3b38801c5a Merge pull request #19099 from twbs/v4-grid-redux 
v4: Grid redux
 2016-02-06 15:18:19 -08:00
Mark Otto fffaaed0fd Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 15:09:32 -08:00
Mark Otto c344ff5b17 Merge pull request #19098 from twbs/v4-font-stack 
v4: Native system font stack for sans-serif
 2016-02-06 15:07:39 -08:00
Mark Otto 8291562258 unrelated linting bs 2016-02-06 15:07:25 -08:00
Mark Otto 9c69f6f5c5 Merge branch 'v4-dev' into v4-font-stack 2016-02-06 15:01:44 -08:00
Mark Otto 447fc28f8d linting grid css 2016-02-06 14:54:13 -08:00
Mark Otto d8e82e2e8f document 2016-02-06 13:32:53 -08:00
Mark Otto cd3af1fa1a Update to drop Open Sans, add Fira and Droid Sans 2016-02-06 13:23:00 -08:00
Mark Otto 844a180fae mention media query changes 2016-02-06 13:05:54 -08:00
Mark Otto ce81dd8537 document migration for grid system /cc #17593 2016-02-06 13:02:59 -08:00
Mark Otto fb4f5f0bf1 document how to customize grid tiers 2016-02-06 13:02:42 -08:00
Mark Otto bc45addbc3 update grid vars docs 2016-02-06 13:02:28 -08:00
Mark Otto 7114e94d66 formatting 2016-02-06 13:02:10 -08:00
Mark Otto 414ae3aa1a use px in grid col padding since we're using px everywhere else for them 2016-02-06 13:01:52 -08:00
Mark Otto 3743f279c1 linting 2016-02-06 12:32:43 -08:00
Mark Otto 8d46a95071 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 12:30:03 -08:00
Mark Otto d5e474b4ab linter 2016-02-06 12:29:53 -08:00
Mark Otto f127bc68a3 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 12:29:06 -08:00
Mark Otto bb9d91182d Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-02-06 12:28:43 -08:00
Mark Otto 03ec195974 linter overhaul 2016-02-06 12:28:18 -08:00
Mark Otto d043fe4eb2 disable linter 2016-02-06 12:27:44 -08:00
Mark Otto 15018a6d8a Ugh, Sass doesn't do extends across media, so we can't use placeholder here 2016-02-06 11:48:28 -08:00
Mark Otto 50e854affa property order and white space 2016-02-06 11:36:45 -08:00
Mark Otto 4ab7c93bcc property order 2016-02-06 11:33:31 -08:00
Mark Otto 95f34be093 More grid updates 
- Flexbox responsive behavior fixed with specific .col-{breakpoint} classes now added
- Dropped the make-col mixin in favor of a column-basics placeholder that we can extend across our grid infrastructure
- Updated docs to use required .col-xs-12 (as a safeguard for when folks enable flexbox mode--this isn't necessary in default grid mode)
- Update flexbox grid docs to include responsive docs, tweak some other bits too
 2016-02-06 11:31:46 -08:00
Mark Otto 414997baa8 flip things around again, no more base class, try out some new stuff to keep responsive flex grid working 2016-02-06 10:51:59 -08:00
Mark Otto 94999c98cf simpler, more specific docs example css 2016-02-06 01:47:40 -08:00
Mark Otto 2a678d4b88 document horizontal flex utils, update the classes for the middle vertical ones 2016-02-06 01:47:25 -08:00
Mark Otto 9e3214051d add horizontal flex utils 2016-02-06 01:47:04 -08:00
Mark Otto 5e41887c3c rename vertical align flex utils to middle to avoid clash with horizontal center 2016-02-06 01:46:42 -08:00
Mark Otto 82b98e72a4 more accurate comments 2016-02-06 01:46:14 -08:00
Mark Otto 44bcaffb95 Tweak docs example CSS for flexbox grid cols 2016-02-06 01:30:31 -08:00
Mark Otto 9a519bb7e3 Add vertical alignment docs for flexbox grid 2016-02-06 01:30:11 -08:00
Mark Otto 7b7cf221cd Move the conditional statement back to the file because nested imports aren't supported in Sass 2016-02-06 01:29:51 -08:00
XhmikosR 7fe2cdde70 Update devDependencies. 
[skip sauce]
 2016-02-06 11:23:17 +02:00
XhmikosR 84a518e450 Bump gems. 
[skip sauce]
 2016-02-06 11:22:29 +02:00
Mark Otto 0de7321bbb rename .flex-all-* to .flex-items-* to match flexbox nomenclature 2016-02-06 00:59:43 -08:00
Mark Otto 044716ed4a Conditionally include the flex utils in the import stack and reduce to a single query 2016-02-06 00:58:19 -08:00