0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

119 Commits

Author SHA1 Message Date
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
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
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
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
Chris Rebert
a5b41e7254 Extract $btn-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Purssell
0762a1978c Allow custom breakpoint config to be passed on by mixins which nest media query mixins. 2016-01-14 16:33:04 +10:00
Chris Rebert
44a1361079 Rename gradient mixins to match new naming convention
gradient-{horizontal=>x}[-three-colors]
gradient-{vertical=>y}[-three-colors]
2016-01-13 15:34:01 -08:00
Chris Rebert
d26b7c7a2c Rename local vars per new naming convention: $padding-{vertical=>y} $padding-{horizontal=>x}
[skip sauce]
[skip validator]
2016-01-13 15:29:06 -08:00
Chris Rebert
ed3551415c Extract $btn-active-box-shadow variable & refactor accordingly
[skip sauce]
[skip validator]
2016-01-09 15:14:36 -08:00
Mark Otto
dfae3d46e4 Add a comment to follow-up on #17756 2016-01-07 00:30:49 -08:00
Mark Otto
2502f84dde Merge pull request #17756 from zalog/patch-11
Flexbox grid column wrapping bug
2016-01-07 00:29:23 -08:00
Mark Otto
6d01de2f74 Merge pull request #18518 from sergej2705/v4-dev-background-variant
Added !important to hover
2016-01-06 01:07:28 -08:00
Chris Rebert
4a05f19a3b Fix syntax of .text-hide's font property value
In SCSS, the quotes were included verbatim in the resulting CSS, which isn't valid syntax for the `font` property.
Removing the quotes fixes the syntax error and does not cause any SCSS compiler error.

[skip sauce]
[skip validator]
2015-12-25 14:06:39 -07:00
Chris Rebert
1e8743ec89 Merge pull request #18473 from twbs/fix-18036
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
2015-12-23 20:33:37 -07:00
Patrick H. Lauke
97461a51a2 progress bar for IE10+/Edge (radius, use ::-ms-fill, add variant mixins, striped support) 2015-12-11 08:58:11 +00:00
sergej2705
7ad62ec9cd Added !important to hover
cause hover isn't working since bg-color is !important
2015-12-10 08:51:09 +01:00
Chris Rebert
c1c1b3885d Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
Fixes #18036

[skip sauce]
[skip validator]
2015-12-08 01:50:42 -08:00
Mark Otto
9e6d1c1ec6 Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6 2015-12-07 23:48:33 -08:00
Chris Rebert
e7edf10473 .page => .page-item 2015-12-07 22:37:17 -08:00
Chris Rebert
0c1df9912f Refactor pagination code to remove unnecessary ancestor requirements in selectors 2015-12-07 22:37:17 -08:00
Chris Rebert
5f35ce2095 .page>{a,span => .page-link} 2015-12-07 22:37:17 -08:00
Chris Rebert
a878c4f0c6 .pagination>{li => .page} 2015-12-07 22:37:17 -08:00
Mark Otto
e5b6922258 Merge pull request #18356 from lesleh/card-mixin
Card mixin
2015-12-07 21:55:26 -08:00
Leslie
c050d1e2e4 Update _cards.scss 2015-11-26 13:33:54 +00:00
Leslie Hoare
cc814f4d76 Create a mixin for creating new card styles.
I'm aware that currently cards are a lot simpler than buttons right now
but this may change in future and it feels cleaner to be able to create
new card styles without needing to know the internals of how they're
implemented.
2015-11-26 13:21:07 +00:00
Mark Otto
763cec82fb Merge pull request #18089 from almirsarajcic/v4-dev
Rename .help-block to .text-help
2015-11-12 23:57:22 -08:00
Mark Otto
99219bac55 Merge pull request #17317 from dmbaughman/v4-media-breakpoint-between
v4 - Added  mixin to handle media queries that span multiple breakpoints
2015-11-12 23:27:16 -08:00
Chris Rebert
fcbf49ae0a Merge pull request #18109 from twbs/color-utils-important
Add !important to text and background color utility classes
2015-11-12 17:02:56 -08:00
Mark Otto
bfa392b097 Merge pull request #18105 from twbs/simpler-retina
Simplify .img-retina mixin and add explanatory comments
2015-11-01 21:40:21 -08:00
Chris Rebert
8bcf60148a Add !important to text and background color utility classes
[skip sauce]
[skip validator]
2015-10-29 21:40:42 -07:00
Chris Rebert
6e8f08dc67 Remove Less->SCSS converter comment left over from bootstrap-sass 2015-10-29 20:45:34 -07:00
Chris Rebert
e0aa54c684 Simplify .img-retina mixin and add explanatory comments
[skip sauce]
[skip validator]
2015-10-29 17:33:22 -07:00
Bass Jobsen
54335d513c cards mixins 2015-10-29 13:44:41 +01:00
Almir Sarajcic
4264621cee Fix #17768 2015-10-28 16:27:55 +01:00
Chris Rebert
726525c0cf mixins/_progress.scss: Note that 0\0 media query hack is for IE9
[skip sauce]
[skip validator]
2015-10-27 12:34:26 -07:00
Chris Rebert
a30a5bb9b5 _grid.scss: Declare left margin before right margin for uniformity; refs #18036
[skip sauce]
[skip validator]
2015-10-23 15:58:10 -07:00
Marko Prelec
d5e47c57f1 Extract list-unstyled mixin; closes #17792
/fyi @mdo
2015-10-13 01:24:11 -07:00
Chris Rebert
3137eec370 Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
2015-10-07 00:07:48 -07:00
Catalin Zalog
e598307a42 v4 - flexbox ie10+ compatibility 2015-10-01 22:03:05 +03:00
Gleb Mazovetskiy
eabed0edf8 Change grid and container sizes to px
Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
2015-09-27 14:39:17 +01:00
vsn4ik
d73d79a7a0 Use "@if not $bool" selector 2015-09-13 16:02:58 +03:00
Mark Otto
339130c040 fixes #17583: only include clearfix on make-container mixin when not in flex mode 2015-09-12 12:30:57 -07:00
vsn4ik
de44d2a3dd Rename file with text-hide mixin 2015-09-06 14:40:19 +03:00
Gleb Mazovetskiy
79aebf6c1d Merge pull request #17364 from twbs/avoid-parent-selector-suffix2
Remove all uses of `selector &` to support nested import
2015-09-05 10:14:59 +01:00
Mark Otto
1a6aad4548 only apply border radius mixins if rounded corners are enabled; alternate fix to #17426 2015-09-03 09:04:51 -07:00