From c175cf2df4acbbbb70f19c9cee9a305c6ce7279a Mon Sep 17 00:00:00 2001 From: aotearoan Date: Sun, 15 Nov 2020 13:05:13 +0100 Subject: [PATCH] removing .neon--disabled and !important styles --- package.json | 2 +- .../action-menu/NeonActionMenu.spec.ts | 2 +- .../navigation/action-menu/NeonActionMenu.vue | 1 - .../dropdown-menu/NeonDropdownMenu.vue | 2 +- .../user-input/button/NeonButton.ts | 2 +- .../user-input/drop-zone/NeonDropZone.vue | 2 +- src/components/user-input/input/NeonInput.vue | 2 - .../user-input/select/NeonSelect.vue | 4 +- .../user-input/switch/NeonSwitch.vue | 2 +- .../user-input/toggle-chip/NeonToggleChip.vue | 2 +- .../user-input/toggle/NeonToggle.vue | 4 +- src/sass/_action-menu.scss | 6 +- src/sass/_base-html.scss | 5 -- src/sass/_button.scss | 4 ++ src/sass/_card.scss | 1 - src/sass/_drop-zone.scss | 1 + src/sass/_dropdown-menu.scss | 4 ++ src/sass/_expansion-panel.scss | 2 +- src/sass/_input.scss | 2 +- src/sass/_select.scss | 8 +++ src/sass/_switch.scss | 4 ++ src/sass/_toggle-chip.scss | 4 ++ src/sass/_toggle.scss | 10 +++- src/sass/colors/_button.scss | 9 +-- src/sass/colors/_card.scss | 12 +++- src/sass/colors/_expansion-indicator.scss | 2 - src/sass/colors/_icon.scss | 6 +- src/sass/colors/_switch.scss | 14 ++--- src/sass/colors/_toggle-color-mixins.scss | 12 +++- src/sass/colors/_toggle.scss | 60 +++++++++---------- src/sass/colors/color-components.scss | 1 - 31 files changed, 112 insertions(+), 80 deletions(-) delete mode 100644 src/sass/colors/_expansion-indicator.scss diff --git a/package.json b/package.json index 2ef930f7..1a4a8443 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@aotearoan/neon", "description": "Neon is a lightweight design library of VueJS components with minimal dependencies. It supports light and dark modes and can be extended to support multiple themes", - "version": "3.5.1", + "version": "3.5.2", "main": "dist/@aotearoan/neon.umd.js", "types": "dist/@aotearoan/components.d.ts", "files": [ diff --git a/src/components/navigation/action-menu/NeonActionMenu.spec.ts b/src/components/navigation/action-menu/NeonActionMenu.spec.ts index 16dfff45..b5838c5c 100644 --- a/src/components/navigation/action-menu/NeonActionMenu.spec.ts +++ b/src/components/navigation/action-menu/NeonActionMenu.spec.ts @@ -44,7 +44,7 @@ describe('NeonActionMenu', () => { propsData: { model, value }, }); // when / then - expect(wrapper.find('.neon-action-menu__link--disabled.neon--disabled').text()).toEqual(model[1].label); + expect(wrapper.find('.neon-action-menu__link--disabled').text()).toEqual(model[1].label); }); it('emits click event', () => { diff --git a/src/components/navigation/action-menu/NeonActionMenu.vue b/src/components/navigation/action-menu/NeonActionMenu.vue index bef2f327..398db6b5 100644 --- a/src/components/navigation/action-menu/NeonActionMenu.vue +++ b/src/components/navigation/action-menu/NeonActionMenu.vue @@ -11,7 +11,6 @@ { 'neon-action-menu__link--selected': item.key === value, 'neon-action-menu__link--disabled': item.disabled, - 'neon--disabled': item.disabled, }, `neon-action-menu__link--${color}`, ]" diff --git a/src/components/navigation/dropdown-menu/NeonDropdownMenu.vue b/src/components/navigation/dropdown-menu/NeonDropdownMenu.vue index 4c3abd57..c99ac391 100644 --- a/src/components/navigation/dropdown-menu/NeonDropdownMenu.vue +++ b/src/components/navigation/dropdown-menu/NeonDropdownMenu.vue @@ -21,7 +21,7 @@ class="neon-dropdown-menu__item" :class="[ { - 'neon--disabled neon-dropdown-menu__item--disabled': item.disabled, + 'neon-dropdown-menu__item--disabled': item.disabled, 'neon-dropdown-menu__item--separator-before': item.separatorBefore, 'neon-dropdown-menu__item--group-title': item.isGroup, 'neon-dropdown-menu__item--grouped': item.grouped, diff --git a/src/components/user-input/button/NeonButton.ts b/src/components/user-input/button/NeonButton.ts index 6ad7fa87..915f95fd 100644 --- a/src/components/user-input/button/NeonButton.ts +++ b/src/components/user-input/button/NeonButton.ts @@ -111,7 +111,7 @@ export default class NeonButton extends Vue { `neon-button--${this.buttonStyle}`, `neon-button--state-${this.state}`, { - 'neon--disabled neon-button--disabled': this.disabled, + 'neon-button--disabled': this.disabled, 'neon-button--circular': this.circular, 'neon-button--no-outline': !this.outline, 'neon-button--full-width': this.fullWidth, diff --git a/src/components/user-input/drop-zone/NeonDropZone.vue b/src/components/user-input/drop-zone/NeonDropZone.vue index b9d4e981..66fde0fd 100644 --- a/src/components/user-input/drop-zone/NeonDropZone.vue +++ b/src/components/user-input/drop-zone/NeonDropZone.vue @@ -4,7 +4,7 @@ ref="dropzone" :class="[ { - 'neon--disabled neon-drop-zone--disabled': disabled, + 'neon-drop-zone--disabled': disabled, 'neon-square neon-drop-zone--circular': circular, 'neon-drop-zone--active': active, }, diff --git a/src/components/user-input/input/NeonInput.vue b/src/components/user-input/input/NeonInput.vue index cd992217..65cf6011 100644 --- a/src/components/user-input/input/NeonInput.vue +++ b/src/components/user-input/input/NeonInput.vue @@ -26,7 +26,6 @@ @blur="onBlur" @focus="onFocus" class="neon-input__textfield neon-input__text" - :class="{ 'neon--disabled': disabled }" v-bind="sanitizedAttributes" v-on="sanitizedListeners" /> @@ -41,7 +40,6 @@ @input="changeValue" @blur="onBlur" @focus="onFocus" - :class="{ 'neon--disabled': disabled }" class="neon-input__textfield neon-input__textarea" v-bind="sanitizedAttributes" > diff --git a/src/components/user-input/select/NeonSelect.vue b/src/components/user-input/select/NeonSelect.vue index cf0985ef..6d910bb8 100644 --- a/src/components/user-input/select/NeonSelect.vue +++ b/src/components/user-input/select/NeonSelect.vue @@ -19,7 +19,7 @@