From e7ba890889001878c69fcc1fdacd74c6655c84a8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 24 Oct 2022 14:35:13 -0400 Subject: [PATCH] refactor: remove unneeded mixin, use bs5 classes and inline style as needed --- public/scss/admin/admin.scss | 4 +--- public/scss/admin/appearance/skins.scss | 3 --- public/scss/admin/appearance/themes.scss | 3 --- public/scss/admin/extend/rewards.scss | 10 +++++----- public/scss/admin/manage/categories.scss | 6 ------ public/scss/admin/manage/groups.scss | 4 ---- public/scss/admin/manage/privileges.scss | 4 ---- public/scss/admin/mixins.scss | 10 ---------- src/views/admin/appearance/skins.tpl | 2 +- src/views/admin/appearance/themes.tpl | 2 +- src/views/admin/extend/rewards.tpl | 2 +- src/views/admin/manage/categories.tpl | 2 +- src/views/admin/manage/groups.tpl | 2 +- src/views/admin/manage/privileges.tpl | 2 +- src/views/admin/partials/save_button.tpl | 2 +- 15 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 public/scss/admin/appearance/skins.scss delete mode 100644 public/scss/admin/appearance/themes.scss diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index c7794ba281..5106629dd7 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -10,8 +10,6 @@ @import "./manage/tags"; @import "./manage/groups"; @import "./appearance/customise"; -@import "./appearance/themes"; -@import "./appearance/skins"; @import "./extend/plugins"; @import "./extend/rewards"; @import "./extend/widgets"; @@ -275,7 +273,7 @@ form small { } #save { - @include floating-button; + transition: background-color 500ms linear; &.saved { background-color: $success; diff --git a/public/scss/admin/appearance/skins.scss b/public/scss/admin/appearance/skins.scss deleted file mode 100644 index 7e53e6da40..0000000000 --- a/public/scss/admin/appearance/skins.scss +++ /dev/null @@ -1,3 +0,0 @@ -#skins > [data-type] button { - @include floating-button; -} \ No newline at end of file diff --git a/public/scss/admin/appearance/themes.scss b/public/scss/admin/appearance/themes.scss deleted file mode 100644 index b5be6cb775..0000000000 --- a/public/scss/admin/appearance/themes.scss +++ /dev/null @@ -1,3 +0,0 @@ -#revert_theme { - @include floating-button; -} \ No newline at end of file diff --git a/public/scss/admin/extend/rewards.scss b/public/scss/admin/extend/rewards.scss index 7b486a19a0..4f20b44bf2 100644 --- a/public/scss/admin/extend/rewards.scss +++ b/public/scss/admin/extend/rewards.scss @@ -44,9 +44,9 @@ } } -#new { - @include floating-button; - - bottom: calc(64px + $spacer); - background-color: $success; +.page-admin-rewards { + #new { + bottom: calc(64px + $spacer); + background-color: $success; + } } \ No newline at end of file diff --git a/public/scss/admin/manage/categories.scss b/public/scss/admin/manage/categories.scss index 2236400652..8c5117990f 100644 --- a/public/scss/admin/manage/categories.scss +++ b/public/scss/admin/manage/categories.scss @@ -96,10 +96,4 @@ div.categories { min-width: 150px; } } -} - -.page-admin-categories { - [data-action="create"] { - @include floating-button; - } } \ No newline at end of file diff --git a/public/scss/admin/manage/groups.scss b/public/scss/admin/manage/groups.scss index 80ed367ccf..8cad8083b2 100644 --- a/public/scss/admin/manage/groups.scss +++ b/public/scss/admin/manage/groups.scss @@ -39,8 +39,4 @@ #group-icon-preview.fa-nbb-none { display: none; } - - #create { - @include floating-button; - } } \ No newline at end of file diff --git a/public/scss/admin/manage/privileges.scss b/public/scss/admin/manage/privileges.scss index 33f95223c2..84e0571008 100644 --- a/public/scss/admin/manage/privileges.scss +++ b/public/scss/admin/manage/privileges.scss @@ -33,8 +33,4 @@ } } } - - #discard { - @include floating-button; - } } \ No newline at end of file diff --git a/public/scss/admin/mixins.scss b/public/scss/admin/mixins.scss index e5424a6574..f3725617ef 100644 --- a/public/scss/admin/mixins.scss +++ b/public/scss/admin/mixins.scss @@ -4,14 +4,4 @@ font-size: 11px; text-transform: uppercase; font-weight: 700; -} - -@mixin floating-button { - width: 64px; - height: 64px; - transition: background-color 500ms linear; - - i { - font-size: 1.5em; - } } \ No newline at end of file diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index be3e77f224..ee4abaeca5 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -4,7 +4,7 @@
-
diff --git a/src/views/admin/appearance/themes.tpl b/src/views/admin/appearance/themes.tpl index 54869b26d0..51f995dfc5 100644 --- a/src/views/admin/appearance/themes.tpl +++ b/src/views/admin/appearance/themes.tpl @@ -4,6 +4,6 @@ - \ No newline at end of file diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 120e563539..8f624bae8c 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -72,7 +72,7 @@
- diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 8eb892e1df..cdb8693964 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -20,6 +20,6 @@
- \ No newline at end of file diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index a6e0a17578..ebe99459b1 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -62,6 +62,6 @@
- diff --git a/src/views/admin/manage/privileges.tpl b/src/views/admin/manage/privileges.tpl index dba55b01b6..c926c6f653 100644 --- a/src/views/admin/manage/privileges.tpl +++ b/src/views/admin/manage/privileges.tpl @@ -24,7 +24,7 @@
- diff --git a/src/views/admin/partials/save_button.tpl b/src/views/admin/partials/save_button.tpl index a2fde120e5..ec5c298896 100644 --- a/src/views/admin/partials/save_button.tpl +++ b/src/views/admin/partials/save_button.tpl @@ -1,3 +1,3 @@ - \ No newline at end of file