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

161 Commits

Author SHA1 Message Date
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
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
Mark Otto
ecc7d9ba26 fix placement of mixin 2015-06-19 00:00:21 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
4bc58b9a5a when using flexbox, don't add a clearfix
doing so fubars the grid column rounding (in safari at least) and causes layout problems
2015-05-27 17:37:22 -07:00
Chris Rebert
82c9038f20 Unquote to avoid NUL chars in the output CSS 2015-05-15 12:17:13 -07:00
Chris Rebert
ee33891e42 Merge pull request #60 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-05-06 13:29:02 -07:00
Mark Otto
ed89be1f44 Remove $line-height-computed
We have it set to `1` right now just to avoid compilation errors, but
it’s been replaced everywhere with our new spacer classes anywho. We’ll
likely want to remap that var to custom component vars though (e.g.,
`$pagination-margin` instead of `$spacer-y`).
2015-04-29 12:00:11 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Mark Otto
490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto
cd3bc6a089 Merge pull request #101 from twbs/institutional-memory
Revert "Images are responsive by default"
2015-04-16 17:03:58 -07:00
Mark Otto
6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto
608be81a43 Fixes #13583: Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss 2015-03-30 17:36:00 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
2015-03-29 00:08:54 -07:00
Chris Rebert
763d77e210 Revert "Images are responsive by default"
This reverts commit d29f851e82.

Making <img>s responsive by-default without opt-in can severely break
third-party widgets such as Google Maps.
This was an acknowledged problem in Bootstrap v2
(see https://github.com/twbs/bootstrap/issues/1506 ) and was fixed in v3
by requiring the .img-responsive class for explicit opt-in
(see 09cdee2f03).
The situation hasn't really changed since then. The responsive-by-default
approach hasn't become any more suitable in the intervening time.

So let's avoid having this regress in v4. :-)
2015-03-28 04:06:22 -07:00
Mark Otto
d29f851e82 Images are responsive by default 2015-03-11 19:19:03 +00:00
Chris Rebert
f265fed3eb account for mq4-hover-shim's renaming & org move 2015-02-04 21:15:01 -08:00
Chris Rebert
fd13e33aa4 add $use-hover-media-query to control @media (hover:hover) usage 2015-01-22 11:39:57 -08:00
Chris Rebert
8e374bd010 put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
Chris Rebert
807a837afe Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
2015-01-08 21:41:33 +00:00
Gleb Mazovetskiy
720d02c5e5 Revert "Remove libsass @media nesting bug workaround"
This reverts commit d6a5ebf438.

There has not been a release of libsass with this fix yet, sorry!
2015-01-08 21:38:12 +00:00
Chris Rebert
d6a5ebf438 Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
2015-01-07 19:17:45 -08:00
Chris Rebert
cbb3b1ff9a Kill scss/mixins/_media-queries.scss
replaced media-xs => media-breakpoint-down(xs)
replaced media-sm => media-breakpoint-up(sm)
replaced media-sm-max => media-breakpoint-only(sm)
replaced media-md => media-breakpoint-up(md)
replaced media-md-max => media-breakpoint-only(md)
replaced media-lg => media-breakpoint-up(lg)
2015-01-06 17:47:13 -08:00
Chris Rebert
746e09f8ae rename media-breakpoint-{min,max} => media-breakpoint-{up,down} 2015-01-06 17:47:13 -08:00
Gleb Mazovetskiy
93f51eb0e9 Automate breakpoints
Breakpoints and container widths are now defined as maps.
2014-12-24 22:27:11 +02:00
Gleb Mazovetskiy
c0c16edc41 Update styles for Ruby Sass compat 2014-12-24 22:22:15 +02:00
Mark Otto
5e102e2600 Merge pull request #50 from twbs/disabled-pseudo
use :disabled pseudo-class instead of [disabled] attribute
2014-12-22 20:13:09 -08:00