2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

14046 Commits

Author SHA1 Message Date
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
Mark Otto f50dedaaaf Move grid flex classes to utils instead maybe? 2016-02-06 00:52:53 -08:00
Mark Otto cac92017d3 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 00:47:40 -08:00
Mark Otto e149a6035e Update base class for grid cols in all examples 2016-02-06 00:47:33 -08:00
Mark Otto 9a645ef51a Ensure docs grid example highlighting for flexbox mode 2016-02-06 00:47:19 -08:00
Mark Otto 511b959ff9 Add flexbox grid page to the docs (still more content to add) 2016-02-06 00:46:50 -08:00
Mark Otto 3f30818a4b Fix docs layout with added base class 2016-02-06 00:46:23 -08:00
Mark Otto a9e428a728 Update grid docs to include new required .col base class 2016-02-06 00:46:00 -08:00
Mark Otto 5a9538d4c7 Revamp grid classes to require .col base class and improve flexbox grid classes with auto layout via flex: 1 2016-02-06 00:45:29 -08:00
Mark Otto 29dcf9ac62 Update grid mixins code snippets in the docs to include flexbox changes 2016-02-06 00:23:52 -08:00
Mark Otto 42c52a278f Improve docs sidenav active link highlighting
Capture the slug once before applying it and add a slash to it to so we get a unique string to match against instead of a fuzzy partial 'contains'. Helps avoid 'grid' highlighting 'flexbox-grid', for example.
2016-02-06 00:22:31 -08:00
Mark Otto 263e06a021 rearrange scss lint config to put flex over float 2016-02-06 00:20:24 -08:00