2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Commit Graph

691 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 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 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
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 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 263e06a021 rearrange scss lint config to put flex over float 2016-02-06 00:20:24 -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
Mark Otto b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -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 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 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
XhmikosR e672d60646 Update print styles to v5.3.0 of html5 boilerplate. 2016-01-26 21:37:44 +02:00
mkroeders a62f70b420 Allow a <label> for .input-group-addon by zeroing out margin-bottom
When using a <label> as an .input-group-addon, there will be a default margin-bottom of .5rem via Reboot.
This will lead to undesirable whitespace below the label and the <input> will become taller than needed. By removing the margin, it will play nice with <label> elements.

Closes #19012
2016-01-23 22:18:43 -08:00
Chris Rebert d54d9d3f7a Merge pull request #19001 from twbs/bump-normalize
Bump Normalize so we can remove Reboot's input[type=search] box-sizing override
2016-01-23 22:11:27 -08:00
Mark Otto e672c15b6d Merge pull request #19002 from twbs/blockquote-border-width
Add $blockquote-border-width variable
2016-01-23 20:42:23 -08:00
Mark Otto fa0e68e486 Merge pull request #19000 from twbs/print-img-max-width-100-hell
Remove print-specific img max-width:100%; style so that Google Maps etc. print correctly
2016-01-23 20:37:36 -08:00
Mark Otto 2fe6c6c88b Merge pull request #18927 from twbs/fix-16871
Apply word-wrap:break-word to Tooltips and Popovers
2016-01-23 20:36:59 -08:00
Chris Rebert 7e2e31e964 scss/_forms.scss: Remove now-unnecessary SCSS-Lint exemption
[skip sauce]
2016-01-23 03:06:21 -08:00
Chris Rebert 739b51f264 Reboot: Remove now-unnecessary input[type="search"] box-sizing override
Revert "fixes #17379: override search input box-sizing to match our global overrides"

This reverts commits 468a9d9359 & 57998dc274.

https://github.com/necolas/normalize.css/pull/496 has made this override unnecessary.

[skip sauce]
2016-01-21 14:50:06 -08:00
Chris Rebert beeafc2808 Bump Normalize to https://github.com/necolas/normalize.css/commit/fe567632afcf8afcf17925ab2a507ed87504cce8
So as to pull in https://github.com/necolas/normalize.css/pull/496
2016-01-21 14:28:41 -08:00
Chris Rebert 8820c563d2 Remove print-specific img max-width:100%; style so that Google Maps and other widgets print correctly
See https://github.com/h5bp/html5-boilerplate/issues/1741
X-Ref: #1506
2016-01-21 14:18:54 -08:00
Patrick H. Lauke 200860334d Add pointer-events:none to custom indicator
Closes #18887
2016-01-19 01:34:47 +00:00
Chris Rebert 032adf1324 Apply word-wrap:break-word to Tooltips and Popovers
Fixes #16871 for v4
2016-01-17 22:23:29 -08:00
Chris Rebert beb9fc2895 Merge pull request #18880 from twbs/gradient-x-y
Rename gradient mixins to match new naming convention
2016-01-17 19:34:10 -08:00
Mark Otto 26f10db70e Merge pull request #18848 from twbs/rounded-progress
Respect $border-rounded inside progress bars too
2016-01-17 19:04:29 -08:00
Mark Otto 11efaf5439 Merge pull request #18878 from twbs/btn-group-vertical
rm unnecessary border-radius properties from .btn-group-vertical code
2016-01-17 19:00:37 -08:00
Mark Otto 955e0405ea fuck around with card borders and more 2016-01-17 18:55:24 -08:00
Mark Otto 776337924e Merge pull request #18920 from twbs/v4-custom-forms-vars
v4: Custom forms variables
2016-01-17 17:54:45 -08:00
Mark Otto dd4062f213 Update docs to include mention of the custom variables file 2016-01-17 16:04:18 -08:00
Mark Otto 567a0e9cee add custom overrides to other bundles 2016-01-17 15:54:17 -08:00
Mark Otto d00eef1dac Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap into stephaniepurvis-provide-custom-scss 2016-01-17 15:51:49 -08:00
Mark Otto 2f4af5c295 condense that comment, clean up formatting 2016-01-17 15:50:27 -08:00
Mark Otto 8a0b8b6b03 Merge pull request #18789 from twbs/fix-18733-more
Prevent breadcrumb separator from getting underlined on hover when not using <ol> markup
2016-01-17 15:45:02 -08:00
Mark Otto c0a8a70d59 Missing ; 2016-01-17 15:32:01 -08:00
Mark Otto 3a2f0456bf Merge pull request #18883 from twbs/zindex-dropdown-backdrop
Use proper variable for .dropdown-backdrop's z-index
2016-01-17 15:25:58 -08:00
Mark Otto 5c12d5e469 add custom file vars, fix up custom select var 2016-01-17 15:21:16 -08:00
Mark Otto 6b318ef176 Hella vars for custom checkboxes and radios and selects 2016-01-16 22:29:51 -08:00
Chris Rebert 802c1cb5fc Extract variables for .modal-content box-shadow
[skip sauce]
[skip validator]
2016-01-16 20:25:00 -08:00
Chris Rebert bbd449994a Extract $thumbnail-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert 9b2d9f6e04 Extract $popover-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert 58f7e602ae Extract $dropdown-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert a5b41e7254 Extract $btn-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert 6293dd41cf Extract $kbd-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert 7be17b4a35 Merge pull request #18821 from twbs/popover-vars
Add variables for padding of popover title & content
2016-01-16 14:08:14 -08:00
Chris Rebert dda263d9ac Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
2016-01-16 14:07:49 -08:00