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

87 Commits

Author SHA1 Message Date
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
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
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
David Baughman
b1fa07b1f7 Adding new line to end of file 2015-09-02 10:09:55 -07:00
Mark Otto
5fc4b35349 Merge pull request #17168 from kkirsche/patch-19
v4 - Rename .img-responsive class to .img-fluid
2015-09-02 00:33:26 -07:00
Andrew Smith
b424626e97 Update all usages of 'control-label' with 'form-control-label' in docs 2015-09-02 15:01:02 +10:00
Kevin Kirsche
54fba7cbe5 Rename .img-responsive class to .img-fluid
Fix #17166
2015-09-01 21:12:28 -07:00
Mark Otto
b5c93eafb8 Merge pull request #17333 from neilhem/combine-size-mixins
Combine size & square mixins into one
2015-09-01 20:25:25 -07:00
Mark Otto
c053f23fe6 Merge pull request #17362 from omeid/v4-container-mixin
Semantic grid: add make-container-breakpoint
2015-09-01 20:13:52 -07:00
Chris Rebert
8ad1f8ddbe Merge pull request #17331 from twbs/fix-17323
rm unused $state param from form-control-validation mixin
2015-08-29 15:55:45 -07:00
David Baughman
e481c8fff2 Merge branch 'v4-dev' into v4-media-breakpoint-between 2015-08-27 13:41:24 -07:00
O'meid
c42d0e10f4 scss: semantic grid: add make-container-breakpoint
Signed-off-by: O'meid <public@omeid.me>
2015-08-28 00:48:06 +10:00
Gleb Mazovetskiy
f7b27a02ce Remove all uses of selector &
If we want to support namespaced import:

```scss
.twbs {
  @import 'bootstrap';
}
```

We cannot use `selector &`, see sass/sass#1817.

`fieldset[disabled] &` is not needed as we no longer support IE8.
2015-08-27 13:11:14 +01:00
Chris Rebert
c6e648d79b rm responsive-invisibility mixin since it's only used once
inline the one remaining usage into .hidden-print's definition
rm now-empty scss/_utilities-responsive.scss file

[skip sauce]
[skip validator]
2015-08-26 15:31:36 -07:00
Chris Rebert
19e996c623 tree shaking: rm unused responsive-visibility mixin
[skip sauce]
[skip validator]
2015-08-26 15:06:09 -07:00
Rakhat Jabagin
865911c35d combine size & square mixins into one 2015-08-26 16:17:00 +06:00
Chris Rebert
5c239aae7d rm unused $state param from form-control-validation mixin; fixes #17323
[skip sauce]
[skip validator]
2015-08-26 01:32:26 -07:00
David Baughman
026682bf0d Added mixin to handle media queries that span multiple breakpoints 2015-08-25 12:53:14 -07:00
Mark Otto
5fc3b1d540 Merge pull request #17113 from JanStevens/v4-fix-retina-mixin
Fixes the _image mixing by prefixing the parameters with $
2015-08-25 07:45:02 -07:00
Kevin Kirsche
d51f0a4f81 Use double colons for psuedo elements
Fix #17052
2015-08-24 13:22:10 -04:00
Mark Otto
27f97e328b shorter clearfix 2015-08-23 00:18:28 -07:00
Mark Otto
54a5fbe0c1 fix #17149: correct syntax in list-group variant mixin; nullifies #17154 2015-08-22 21:46:46 -07:00
Mark Otto
1f153b640d re-fix #16154 in v4-dev /cc #17101 2015-08-22 19:05:43 -07:00
Mark Otto
990d646bcd fix shadows on btns to use mixin 2015-08-22 19:01:11 -07:00
Jan Stevens
b7b8f98c86 Fixes the _image mixing by prefixing the parameters with $ 2015-08-20 11:35:00 +02:00
Gleb Mazovetskiy
f88cbe7ee4 Fix -flex compile on Sass Ruby #17046 2015-08-20 08:38:02 +01:00
Mark Otto
82615e9919 no bg-color to start on outline buttons so they're easier to use on light and dark color schemes 2015-08-17 23:43:25 -07:00
Mark Otto
6a75d07e0c Use -* vars for .bg-* and .text-* utilities
- Simplifies variables usage
- Makes components and brand variable usage more consistent (dark bg and white text throughout instead of some mixed light and dark bgs)
- Very likely means lower contrast and thus no more AA compliance (we'll want to fix that eventually obviously)
2015-08-13 23:47:47 -07:00
Mark Otto
9b1ee31567 nuke the shared padding vars and assign to individual components
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
2015-08-13 23:04:16 -07:00
Thomas McDonald
1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00