Commit 6b394ab0 authored by Mark Otto's avatar Mark Otto

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts:
	docs/components/helpers.md
	scss/_utilities.scss
parents 1f5a75e2 5e102e26
This diff is collapsed.
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
} }
&.disabled, &.disabled,
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
pointer-events: none; // Future-proof disabling of clicks pointer-events: none; // Future-proof disabling of clicks
cursor: $cursor-disabled; cursor: $cursor-disabled;
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
&, &,
&:active, &:active,
&.active, &.active,
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
background-color: transparent; background-color: transparent;
@include box-shadow(none); @include box-shadow(none);
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
text-decoration: underline; text-decoration: underline;
background-color: transparent; background-color: transparent;
} }
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
&:hover, &:hover,
&:focus { &:focus {
......
...@@ -133,6 +133,7 @@ output { ...@@ -133,6 +133,7 @@ output {
// Placeholder // Placeholder
&::placeholder { &::placeholder {
color: $input-color-placeholder; color: $input-color-placeholder;
opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
} }
// Disabled and read-only inputs // Disabled and read-only inputs
...@@ -140,7 +141,7 @@ output { ...@@ -140,7 +141,7 @@ output {
// HTML5 says that controls under a fieldset > legend:first-child won't be // HTML5 says that controls under a fieldset > legend:first-child won't be
// disabled if the fieldset is disabled. Due to implementation difficulty, we // disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway. // don't honor that edge case; we style them as disabled anyway.
&[disabled], &:disabled,
&[readonly], &[readonly],
fieldset[disabled] & { fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
...@@ -263,7 +264,7 @@ input[type="search"] { ...@@ -263,7 +264,7 @@ input[type="search"] {
// Note: Neither radios nor checkboxes can be readonly. // Note: Neither radios nor checkboxes can be readonly.
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
&[disabled], &:disabled,
&.disabled, &.disabled,
fieldset[disabled] & { fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
......
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
&:focus { &:focus {
color: $navbar-default-link-hover-color; color: $navbar-default-link-hover-color;
} }
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
&:hover, &:hover,
&:focus { &:focus {
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
color: $navbar-inverse-link-hover-color; color: $navbar-inverse-link-hover-color;
} }
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
&:hover, &:hover,
&:focus { &:focus {
......
...@@ -46,12 +46,6 @@ ...@@ -46,12 +46,6 @@
z-index: $zindex-navbar-fixed; z-index: $zindex-navbar-fixed;
} }
// Toggling content
.show {
display: block !important;
}
// Always hide an element with the `hidden` HTML attribute (from PureCSS). // Always hide an element with the `hidden` HTML attribute (from PureCSS).
[hidden] { [hidden] {
display: none !important; display: none !important;
...@@ -66,15 +60,6 @@ ...@@ -66,15 +60,6 @@
} }
// Hide from screenreaders and browsers
//
// Credit: HTML5 Boilerplate
.hidden {
display: none !important;
visibility: hidden !important;
}
// For Affix plugin // For Affix plugin
.affix { .affix {
position: fixed; position: fixed;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled, &.disabled,
&[disabled], &:disabled,
fieldset[disabled] & { fieldset[disabled] & {
&, &,
&:hover, &:hover,
......
...@@ -16,15 +16,13 @@ ...@@ -16,15 +16,13 @@
// Retina image // Retina image
// //
// Short retina mixin for setting background-image and -size. Note that the // Short retina mixin for setting background-image and -size.
// spelling of `min--moz-device-pixel-ratio` is intentional.
@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
background-image: url("#{file-1x}"); background-image: url("#{file-1x}");
@media @media
only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and ( min--moz-device-pixel-ratio: 2),
only screen and ( -o-min-device-pixel-ratio: 2/1), only screen and ( -o-min-device-pixel-ratio: 2/1),
only screen and ( min-device-pixel-ratio: 2), only screen and ( min-device-pixel-ratio: 2),
only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 192dpi),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment