From 9113193d0f6db476ef54e42037f43e9eb0e63db6 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Mon, 19 Apr 2021 14:58:37 +0100 Subject: [PATCH] perf: more css cleanup --- src/components/modals/main/scss/index.scss | 1 + .../main/scss/marketplace/_buttons.scss | 48 +++++++++++ .../modals/main/scss/settings/_buttons.scss | 84 ------------------- .../settings/sections/background/Colour.jsx | 2 +- 4 files changed, 50 insertions(+), 85 deletions(-) create mode 100644 src/components/modals/main/scss/marketplace/_buttons.scss diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index 6654eb9d..768e128f 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -7,6 +7,7 @@ @import 'settings/daypicker'; @import 'marketplace/main'; +@import 'marketplace/buttons'; .Modal { color: var(--modal-text); diff --git a/src/components/modals/main/scss/marketplace/_buttons.scss b/src/components/modals/main/scss/marketplace/_buttons.scss new file mode 100644 index 00000000..e9b593a0 --- /dev/null +++ b/src/components/modals/main/scss/marketplace/_buttons.scss @@ -0,0 +1,48 @@ +%storebutton { + cursor: pointer; + font-size: 18px; + display: block; + padding: 5px 30px; + background: none; + border-radius: 24px; + transition: ease 0.33s; + border: 2px solid black; + + &:hover { + background: #2d3436; + color: map-get($theme-colours, 'main'); + } + } + + .dark %storebutton { + border: 2px solid map-get($theme-colours, 'main'); + color: map-get($theme-colours, 'main'); + + &:hover { + background: map-get($theme-colours, 'main'); + color: #2d3436; + } + } + + .removeFromMue { + @extend %storebutton; + + border: 2px solid #ff4757; + color: #ff4757; + margin-top: 5px; + + &:hover { + background: #ff4757; + color: map-get($theme-colours, 'main'); + } + } + + .addToMue { + @extend %storebutton; + margin-top: 5px; + } + + .sideload { + display: inline; + margin-top: 0px; + } \ No newline at end of file diff --git a/src/components/modals/main/scss/settings/_buttons.scss b/src/components/modals/main/scss/settings/_buttons.scss index ce55f5d7..458e43a3 100644 --- a/src/components/modals/main/scss/settings/_buttons.scss +++ b/src/components/modals/main/scss/settings/_buttons.scss @@ -25,19 +25,6 @@ } } -.close { - @extend %settingsButton; - - padding: 10px 50px 10px 50px; - background-color: map-get($button-colours, 'other'); - border: 2px solid map-get($button-colours, 'other'); - - &:hover { - color: map-get($button-colours, 'other'); - border: 2px solid map-get($button-colours, 'other'); - } -} - .add { @extend %settingsButton; @@ -70,77 +57,6 @@ margin-left: 20px; } -%storebutton { - cursor: pointer; - font-size: 18px; - display: block; - padding: 5px 30px; - background: none; - border-radius: 24px; - transition: ease 0.33s; - border: 2px solid black; - - &:hover { - background: #2d3436; - color: map-get($theme-colours, 'main'); - } -} - -.dark %storebutton { - border: 2px solid map-get($theme-colours, 'main'); - color: map-get($theme-colours, 'main'); - - &:hover { - background: map-get($theme-colours, 'main'); - color: #2d3436; - } -} - -.removeFromMue { - @extend %storebutton; - - border: 2px solid #ff4757; - color: #ff4757; - - &:hover { - background: #ff4757; - color: map-get($theme-colours, 'main'); - } -} - -#item .addToMue, -#item .removeFromMue { - margin-top: 5px; -} - -.addToMue { - @extend %storebutton; -} - -.goToMarket { - float: none; - @extend %storebutton; -} - -.sideload { - display: inline; -} - -.stop { - outline: none; - border-image-slice: 1; - border-image-source: map-get($theme-colours, 'gradient'); - font-size: 1.2em; - padding-left: 7px; - vertical-align: middle; -} - -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { - opacity: 1; - outline: none; -} - .MuiIconButton-label > svg.MuiSvgIcon-root { color: var(--modal-text) !important; } diff --git a/src/components/modals/main/settings/sections/background/Colour.jsx b/src/components/modals/main/settings/sections/background/Colour.jsx index 46acfb1b..e6da0b9a 100644 --- a/src/components/modals/main/settings/sections/background/Colour.jsx +++ b/src/components/modals/main/settings/sections/background/Colour.jsx @@ -27,7 +27,7 @@ export default class ColourSettings extends React.PureComponent { this.setState({ gradientSettings: this.DefaultGradientSettings }); - toast(this.language.toasts.reset); + toast(window.language.toasts.reset); } initialiseColorPickerState(gradientSettings) {