From 7056f702408a97f01cb32bc6075d88ec27cdcf52 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Mon, 10 Apr 2017 22:07:44 +0100 Subject: [PATCH 1/3] Remove `cursor: not-allowed` styles --- scss/_buttons.scss | 1 - scss/_custom-forms.scss | 3 --- scss/_dropdown.scss | 1 - scss/_forms.scss | 5 ----- scss/_list-group.scss | 1 - scss/_nav.scss | 3 +-- scss/_pagination.scss | 1 - scss/_reboot.scss | 7 ------- scss/_variables.scss | 3 --- 9 files changed, 1 insertion(+), 24 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 4a8ffcbe5..8b669531f 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -28,7 +28,6 @@ // Disabled comes first so active can properly restyle &.disabled, &:disabled { - cursor: $cursor-disabled; opacity: .65; @include box-shadow(none); } diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index d303c48d0..9133f7dbd 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -41,13 +41,11 @@ &:disabled { ~ .custom-control-indicator { - cursor: $custom-control-disabled-cursor; background-color: $custom-control-disabled-indicator-bg; } ~ .custom-control-description { color: $custom-control-disabled-description-color; - cursor: $custom-control-disabled-cursor; } } } @@ -165,7 +163,6 @@ &:disabled { color: $custom-select-disabled-color; - cursor: $cursor-disabled; background-color: $custom-select-disabled-bg; } diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 090fdf1c1..116a84a3b 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -90,7 +90,6 @@ &.disabled, &:disabled { color: $dropdown-link-disabled-color; - cursor: $cursor-disabled; background-color: transparent; // Remove CSS gradients if they're enabled @if $enable-gradients { diff --git a/scss/_forms.scss b/scss/_forms.scss index 11fa94a25..55e8cb43a 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -58,10 +58,6 @@ // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655. opacity: 1; } - - &:disabled { - cursor: $cursor-disabled; - } } select.form-control { @@ -212,7 +208,6 @@ select.form-control-lg { &.disabled { .form-check-label { color: $text-muted; - cursor: $cursor-disabled; } } } diff --git a/scss/_list-group.scss b/scss/_list-group.scss index c4b5e2f92..c7172e4ff 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -65,7 +65,6 @@ &.disabled, &:disabled { color: $list-group-disabled-color; - cursor: $cursor-disabled; background-color: $list-group-disabled-bg; } diff --git a/scss/_nav.scss b/scss/_nav.scss index 2b6b2a7f3..973679eee 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -19,10 +19,9 @@ text-decoration: none; } - // Disabled state lightens text and removes hover/tab effects + // Disabled state lightens text &.disabled { color: $nav-disabled-link-color; - cursor: $cursor-disabled; } } diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 24aa028d1..4389e0f92 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -29,7 +29,6 @@ &.disabled .page-link { color: $pagination-disabled-color; pointer-events: none; - cursor: $cursor-disabled; // While `pointer-events: none` removes the cursor in modern browsers, we provide a disabled cursor as a fallback. background-color: $pagination-disabled-bg; border-color: $pagination-disabled-border; } diff --git a/scss/_reboot.scss b/scss/_reboot.scss index c52e6f887..6a8c6ab37 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -368,13 +368,6 @@ input[type="radio"], input[type="checkbox"] { box-sizing: border-box; // 1. Add the correct box sizing in IE 10- padding: 0; // 2. Remove the padding in IE 10- - - // Apply a disabled cursor for radios and checkboxes. - // - // Note: Neither radios nor checkboxes can be readonly. - &:disabled { - cursor: $cursor-disabled; - } } diff --git a/scss/_variables.scss b/scss/_variables.scss index d277011b2..957e69d5c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -433,8 +433,6 @@ $form-group-margin-bottom: 1rem !default; $input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border-color !default; -$cursor-disabled: not-allowed !default; - $custom-control-gutter: 1.5rem !default; $custom-control-spacer-y: .25rem !default; $custom-control-spacer-x: 1rem !default; @@ -444,7 +442,6 @@ $custom-control-indicator-bg: #ddd !default; $custom-control-indicator-bg-size: 50% 50% !default; $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default; -$custom-control-disabled-cursor: $cursor-disabled !default; $custom-control-disabled-indicator-bg: $gray-lighter !default; $custom-control-disabled-description-color: $gray-light !default; From eae1d3873365f8f6ffcf4bc167977cd41b206469 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Apr 2017 21:12:24 -0700 Subject: [PATCH 2/3] Package grunt (#22396) Remove docs files and Gruntfile from package managers --- bower.json | 1 + package.json | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 510770926..cf339b7f1 100644 --- a/bower.json +++ b/bower.json @@ -25,6 +25,7 @@ "composer.json", "CONTRIBUTING.md", "docs", + "Gruntfile.js", "js/tests", "test-infra" ], diff --git a/package.json b/package.json index d11ffbf41..7d2f2d893 100644 --- a/package.json +++ b/package.json @@ -88,10 +88,8 @@ }, "files": [ "dist", - "grunt", "js/**/*.js", "scss/**/*.scss", - "Gruntfile.js", "LICENSE" ], "jspm": { From 53b2c5520bb5d9fb8170692803870c8dbc8bf206 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Tue, 11 Apr 2017 11:12:30 +0100 Subject: [PATCH 3/3] Remove inappropriate role="listbox" from carousels --- docs/components/carousel.md | 8 ++++---- docs/examples/carousel/index.html | 2 +- js/tests/visual/carousel.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/components/carousel.md b/docs/components/carousel.md index e75484316..d1606940a 100644 --- a/docs/components/carousel.md +++ b/docs/components/carousel.md @@ -28,7 +28,7 @@ Here's a carousel with slides only. Note the presence of the `.d-block` and `.im {% example html %}