Commit graph

15897 commits

Author SHA1 Message Date
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
Mark Otto
73e5e89e0e Switch to native font stack 2016-02-05 23:01:59 -08:00
Mark Otto
18be3be3f4 grunt 2016-02-05 22:26:22 -08:00
Mark Otto
ba8ad7c5b5 Merge pull request #19086 from twbs/migration-vendor-prefix-mixins
Add migration guidance regarding vendor prefix mixins
2016-02-05 22:01:50 -08:00
Chris Rebert
f6831e4d4f Merge pull request #19089 from Quy/patch-5
Remove section on pager changes from migration, since pagers have been removed entirely
2016-02-05 10:54:08 -08:00
Quy
3076790add Remove pager section from migration 2016-02-05 04:40:18 -08:00
Chris Rebert
a903f48ac2 Merge pull request #19088 from twbs/wkbug-153856
Add Wall of Browser Bugs entry for https://webkit.org/b/153856
2016-02-04 23:19:05 -08:00
Chris Rebert
12a506f1cd Add Wall of Browser Bugs entry for https://webkit.org/b/153856
Refs https://github.com/twbs/bootstrap/issues/14839#issuecomment-60940738
[skip sauce]
2016-02-04 23:12:53 -08:00
Chris Rebert
c33783814b Add migration guidance regarding vendor prefix mixins
Refs #19080
2016-02-04 20:38:46 -08:00
Chris Rebert
040522ce7a Merge pull request #19079 from twbs/fix-18992
Revert separation of <hN> and .hN heading styles
2016-02-04 00:11:48 -08:00
Chris Rebert
23979a9994 Revert separation of <hN> and .hN heading styles
This reverts commit deeb74e321.

Reverts #18038
Fixes #18992
[skip sauce]
[skip validator]
2016-02-04 00:05:02 -08:00
Chris Rebert
1d277de0b0 Merge pull request #19078 from twbs/compat-docs-wkbug-153852
Mention https://webkit.org/b/153852 in browser compatibility docs
2016-02-03 22:57:05 -08:00
Chris Rebert
2c86b67a0b Mention https://webkit.org/b/153852 in browser compatibility docs
Refs #19077
[skip sauce]
2016-02-03 22:52:12 -08:00
Chris Rebert
cf7aee4b8a Merge pull request #19077 from twbs/wkbug-153852
Add Wall of Browser Bugs entry for https://webkit.org/b/153852
2016-02-03 22:37:24 -08:00
Chris Rebert
566290f32e Add Wall of Browser Bugs entry for https://webkit.org/b/153852
Refs http://getbootstrap.com/getting-started/#overflow-and-scrolling
Refs #14839
[skip sauce]
2016-02-03 22:31:15 -08:00
Mark Otto
b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -08:00
Mark Otto
f31575ad63 grunt 2016-02-03 20:53:00 -08:00
Mark Otto
b75a0ca979 fuck that other class, let's just get tabs and pills in there 2016-02-03 20:52:33 -08:00
Mark Otto
0f18bd3257 grunt 2016-02-03 20:43:16 -08:00
Mark Otto
b4a2b99395 Dump the type margin overrides in alerts for utils, document that particular example, sidesteps part of #18884 2016-02-03 20:43:12 -08:00
Mark Otto
2ac922c78f grunt 2016-02-03 19:45:19 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Mark Otto
102a20f5b3 center the nav 2016-02-03 19:29:15 -08:00
Mark Otto
0e70c6a37f Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-02-03 19:23:29 -08:00
Chris Rebert
19be536083 Merge pull request #19072 from twbs/bump-shrinkwrap
Update shrinkwrap
2016-02-02 22:49:48 -08:00
Chris Rebert
da0d1721d2 update shrinkwrap 2016-02-02 22:41:58 -08:00
Johann-S
14ec4fdfc1 Carousel - Do not prevent on keydown for input and textarea 2016-02-01 00:06:07 +01:00