Commit 344c0b5b authored by Pierre-Denis Vanduynslager's avatar Pierre-Denis Vanduynslager
Browse files

Merge remote-tracking branch 'twbs/v4-dev' into v4-dev

parents 8a26268c 0bf3f176
1 merge request!19864Dropdown: remove dependency to role="menu", role="listbox" a and li elements => fix keyboard navigation
This commit is part of merge request !19864. Comments created here will be created in the context of that merge request.
Showing with 20 additions and 17 deletions
+20 -17
...@@ -508,7 +508,9 @@ Only applies to small devices and above. ...@@ -508,7 +508,9 @@ Only applies to small devices and above.
## Columns ## Columns
Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns with just CSS by wrapping them in `.card-columns`. Only applies to small devices and above. Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns with just CSS by wrapping them in `.card-columns`. Cards are ordered vertically when wrapped in `.card-columns`.
Only applies to small devices and above.
**Heads up!** This is **not available in IE9 and below** as they have no support for the [`column-*` CSS properties](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Using_multi-column_layouts). **Heads up!** This is **not available in IE9 and below** as they have no support for the [`column-*` CSS properties](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Using_multi-column_layouts).
......
...@@ -48,20 +48,16 @@ ...@@ -48,20 +48,16 @@
} }
} }
@if $enable-rounded { .card {
.card { > .list-group:first-child {
> .list-group:first-child { .list-group-item:first-child {
.list-group-item:first-child { @include border-top-radius($card-border-radius);
border-top-left-radius: $card-border-radius;
border-top-right-radius: $card-border-radius;
}
} }
}
> .list-group:last-child { > .list-group:last-child {
.list-group-item:last-child { .list-group-item:last-child {
border-bottom-right-radius: $card-border-radius; @include border-bottom-radius($card-border-radius);
border-bottom-left-radius: $card-border-radius;
}
} }
} }
} }
...@@ -195,10 +191,10 @@ ...@@ -195,10 +191,10 @@
// Card image caps // Card image caps
.card-img-top { .card-img-top {
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0); @include border-top-radius($card-border-radius-inner);
} }
.card-img-bottom { .card-img-bottom {
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner); @include border-bottom-radius($card-border-radius-inner);
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
padding: $thumbnail-padding; padding: $thumbnail-padding;
background-color: $thumbnail-bg; background-color: $thumbnail-bg;
border: $thumbnail-border-width solid $thumbnail-border-color; border: $thumbnail-border-width solid $thumbnail-border-color;
border-radius: $thumbnail-border-radius; @include border-radius($thumbnail-border-radius);
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
@include box-shadow($thumbnail-box-shadow); @include box-shadow($thumbnail-box-shadow);
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
display: block; display: block;
padding: $nav-link-padding; padding: $nav-link-padding;
border: $nav-tabs-border-width solid transparent; border: $nav-tabs-border-width solid transparent;
@include border-radius($border-radius $border-radius 0 0); @include border-top-radius($nav-tabs-border-radius);
@include hover-focus { @include hover-focus {
border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
......
...@@ -325,8 +325,10 @@ $input-border-radius: $border-radius !default; ...@@ -325,8 +325,10 @@ $input-border-radius: $border-radius !default;
$input-border-radius-lg: $border-radius-lg !default; $input-border-radius-lg: $border-radius-lg !default;
$input-border-radius-sm: $border-radius-sm !default; $input-border-radius-sm: $border-radius-sm !default;
$input-bg-focus: $input-bg;
$input-border-focus: #66afe9 !default; $input-border-focus: #66afe9 !default;
$input-box-shadow-focus: rgba(102,175,233,.6) !default; $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-focus: $input-color;
$input-color-placeholder: #999 !default; $input-color-placeholder: #999 !default;
...@@ -502,6 +504,7 @@ $nav-disabled-link-hover-bg: transparent !default; ...@@ -502,6 +504,7 @@ $nav-disabled-link-hover-bg: transparent !default;
$nav-tabs-border-color: #ddd !default; $nav-tabs-border-color: #ddd !default;
$nav-tabs-border-width: $border-width !default; $nav-tabs-border-width: $border-width !default;
$nav-tabs-border-radius: $border-radius !default;
$nav-tabs-link-hover-border-color: $gray-lighter !default; $nav-tabs-link-hover-border-color: $gray-lighter !default;
$nav-tabs-active-link-hover-color: $gray !default; $nav-tabs-active-link-hover-color: $gray !default;
$nav-tabs-active-link-hover-bg: $body-bg !default; $nav-tabs-active-link-hover-bg: $body-bg !default;
......
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
// contrast against a dark gray background. // contrast against a dark gray background.
@mixin form-control-focus() { @mixin form-control-focus() {
&:focus { &:focus {
color: $input-color-focus;
background-color: $input-bg-focus;
border-color: $input-border-focus; border-color: $input-border-focus;
outline: none; outline: none;
$shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $input-box-shadow-focus; $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $input-box-shadow-focus;
......
Supports Markdown
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