From bf3be5a456b3f6699a7832957dc0d1fbf6ac1590 Mon Sep 17 00:00:00 2001 From: Mark Otto <markdotto@gmail.com> Date: Mon, 27 Oct 2014 20:37:52 -0700 Subject: [PATCH] swap cursor not-allow for default, and use a variable for all disabled elements --- less/buttons.less | 2 +- less/dropdowns.less | 2 +- less/forms.less | 8 ++++---- less/list-group.less | 2 +- less/navs.less | 2 +- less/pager.less | 2 +- less/pagination.less | 2 +- less/variables.less | 3 +++ 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/less/buttons.less b/less/buttons.less index d32c4e2d80..40553c6386 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -46,7 +46,7 @@ &.disabled, &[disabled], fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; pointer-events: none; // Future-proof disabling of clicks .opacity(.65); .box-shadow(none); diff --git a/less/dropdowns.less b/less/dropdowns.less index 742c912658..84a48c1413 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -111,7 +111,7 @@ background-color: transparent; background-image: none; // Remove CSS gradient .reset-filter(); - cursor: not-allowed; + cursor: @cursor-disabled; } } diff --git a/less/forms.less b/less/forms.less index aefc0dea5c..38e4ce6d64 100644 --- a/less/forms.less +++ b/less/forms.less @@ -141,7 +141,7 @@ output { &[disabled], &[readonly], fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; background-color: @input-bg-disabled; opacity: 1; // iOS fix for unreadable disabled content } @@ -275,7 +275,7 @@ input[type="checkbox"] { &[disabled], &.disabled, fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; } } // These classes are used directly on <label>s @@ -283,7 +283,7 @@ input[type="checkbox"] { .checkbox-inline { &.disabled, fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; } } // These classes are used on elements with <label> descendants @@ -292,7 +292,7 @@ input[type="checkbox"] { &.disabled, fieldset[disabled] & { label { - cursor: not-allowed; + cursor: @cursor-disabled; } } } diff --git a/less/list-group.less b/less/list-group.less index 1e62d3b94d..da657005e9 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -74,7 +74,7 @@ a.list-group-item { &.disabled:focus { background-color: @list-group-disabled-bg; color: @list-group-disabled-color; - cursor: not-allowed; + cursor: @cursor-disabled; // Force color to inherit for custom content .list-group-item-heading { diff --git a/less/navs.less b/less/navs.less index 8cf81d7e17..f26fec7a5c 100644 --- a/less/navs.less +++ b/less/navs.less @@ -36,7 +36,7 @@ color: @nav-disabled-link-hover-color; text-decoration: none; background-color: transparent; - cursor: not-allowed; + cursor: @cursor-disabled; } } } diff --git a/less/pager.less b/less/pager.less index 73a660d64e..41abaaadc5 100644 --- a/less/pager.less +++ b/less/pager.less @@ -48,7 +48,7 @@ > span { color: @pager-disabled-color; background-color: @pager-bg; - cursor: not-allowed; + cursor: @cursor-disabled; } } } diff --git a/less/pagination.less b/less/pagination.less index b2856ae60e..38c4c3d346 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -69,7 +69,7 @@ color: @pagination-disabled-color; background-color: @pagination-disabled-bg; border-color: @pagination-disabled-border; - cursor: not-allowed; + cursor: @cursor-disabled; } } } diff --git a/less/variables.less b/less/variables.less index 0be497aff1..c89e6e2729 100644 --- a/less/variables.less +++ b/less/variables.less @@ -214,6 +214,9 @@ //** Border color for textual input addons @input-group-addon-border-color: @input-border; +//** Disabled cursor for form controls and buttons. +@cursor-disabled: default; + //== Dropdowns // -- GitLab