From 672469137252a3e9f39cb1154bcd98795e88e377 Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Tue, 16 Oct 2018 23:11:02 -0500 Subject: [PATCH 1/9] Enhancement: Fix Styling on vs-pagination Standardized the disable styling of vs-pagination --- src/components/vsPagination/main.styl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/vsPagination/main.styl b/src/components/vsPagination/main.styl index d4084790f..4f580306f 100644 --- a/src/components/vsPagination/main.styl +++ b/src/components/vsPagination/main.styl @@ -85,8 +85,9 @@ &.btn-next-pagination margin-left: 5px &.btn-pagination.disabled - color: rgba(0,0,0,.1) + color: rgba(0,0,0,$vs-disabled-opacity) cursor: default + pointer-events: none &.btn-pagination.disabled:hover background: rgb(240,240,240) !important i From 9ffaee5781482ec7e7be9114652bd95b43f77781 Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Tue, 16 Oct 2018 23:55:08 -0500 Subject: [PATCH 2/9] Fix: Standardize Select Disabled styling Added disabled styling to standardize behaviour. --- src/components/vsSelect/main.styl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/vsSelect/main.styl b/src/components/vsSelect/main.styl index a79c88c01..c9e7f0bf4 100644 --- a/src/components/vsSelect/main.styl +++ b/src/components/vsSelect/main.styl @@ -51,6 +51,10 @@ padding-left 5px; font-size: .85rem color $vs-label-color + &:disabled + opacity $vs-disabled-opacity + cursor: default + pointer-events: none .con-text-validation position: relative font-size: .65rem @@ -135,6 +139,8 @@ for colorx, i in $vs-colors text-transform: capitalize; &.disabledx opacity: $vs-disabled-opacity; + cursor: default + pointer-events: none span.searchx background: rgba(0, 0, 0, 0.07); border-bottom: 1px solid rgba(0, 0, 0, 0.3); From 386c887ff97bc6287d7932c693ee7f6c5592478a Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Wed, 17 Oct 2018 00:00:25 -0500 Subject: [PATCH 3/9] Fix: Standardize Switch Disabled styling Added disabled styling to standardize behaviour. --- src/components/vsSwitch/main.styl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/vsSwitch/main.styl b/src/components/vsSwitch/main.styl index 22af62aff..1a20dff34 100644 --- a/src/components/vsSwitch/main.styl +++ b/src/components/vsSwitch/main.styl @@ -49,7 +49,9 @@ opacity: 1 transform: translate(0px); &:disabled - opacity: .5; + opacity $vs-disabled-opacity + cursor: default + pointer-events: none .vs-circle-switch display: block; width: 18px; From bfdfa0a5be7895d79f0d7aeeea9b47513ecbf992 Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Wed, 17 Oct 2018 00:35:17 -0500 Subject: [PATCH 4/9] Fix: Standardize Checkbox Disabled styling Added disabled styling to standardize behaviour. --- src/components/vsCheckBox/main.styl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/vsCheckBox/main.styl b/src/components/vsCheckBox/main.styl index 5681ba5a6..a02a9cb8c 100644 --- a/src/components/vsCheckBox/main.styl +++ b/src/components/vsCheckBox/main.styl @@ -22,6 +22,16 @@ z-index: 200; cursor: pointer; background: rgb(85, 215, 117); + &:disabled + cursor: default; + pointer-events: none; + & + span.checkbox_x + opacity $vs-disabled-opacity; + cursor: default; + pointer-events: none; + span._check + cursor: default; + pointer-events: none; &:active:checked & + span.checkbox_x span._check From 557cc115eb570fdda30c9756396cb10a0f075e85 Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Wed, 17 Oct 2018 00:50:24 -0500 Subject: [PATCH 5/9] Fix: Standardize Switch Disabled styling Added disabled styling to standardize behaviour. --- src/components/vsInput/main.styl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/vsInput/main.styl b/src/components/vsInput/main.styl index 5ee3a1905..17d20fee1 100644 --- a/src/components/vsInput/main.styl +++ b/src/components/vsInput/main.styl @@ -65,6 +65,14 @@ + .input-span-placeholder padding-left: .4rem; padding-right: 28px + &:disabled + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; + + .input-span-placeholder + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; .input-span-placeholder transition: all .2s ease position: absolute From 36f09995c6d381693fd91c35939fc5d60367d8b9 Mon Sep 17 00:00:00 2001 From: Keith Lewis Date: Wed, 17 Oct 2018 01:23:10 -0500 Subject: [PATCH 6/9] Fix: Standardize Input Number Disabled styling Added disabled styling to standardize behaviour. --- src/components/vsInputNumber/main.styl | 24 ++++++++++++++++++- .../vsInputNumber/vsInputNumber.vue | 12 ++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/components/vsInputNumber/main.styl b/src/components/vsInputNumber/main.styl index 124b44a59..253eab307 100644 --- a/src/components/vsInputNumber/main.styl +++ b/src/components/vsInputNumber/main.styl @@ -43,7 +43,9 @@ color: rgba(255,255,255,1) backface-visibility hidden &:disabled - opacity: .5 !important + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; i font-size: .9rem @@ -52,10 +54,30 @@ transform translate(10px) &:active transform scale(.9) translate(10px) !important + &:disabled + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; + background-color: rgba(0,0,0,$vs-disabled-opacity) !important; + &.btn-plus.limit + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; + background-color: rgba(0,0,0,$vs-disabled-opacity) !important; &.btn-less transform translate(-10px) &:active transform scale(.9) translate(-10px) !important + &:disabled + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; + background-color: rgba(0,0,0,$vs-disabled-opacity) !important; + &.btn-less.limit + opacity: $vs-disabled-opacity; + cursor: default; + pointer-events: none; + background-color: rgba(0,0,0,$vs-disabled-opacity) !important; &.vs-input-number-size-medium input diff --git a/src/components/vsInputNumber/vsInputNumber.vue b/src/components/vsInputNumber/vsInputNumber.vue index baf9ca732..55c648a3b 100644 --- a/src/components/vsInputNumber/vsInputNumber.vue +++ b/src/components/vsInputNumber/vsInputNumber.vue @@ -9,9 +9,11 @@