From ca78215a698091553e75522a3b0d2ea8fd4753de Mon Sep 17 00:00:00 2001 From: Aaron Manaloto Date: Fri, 30 Aug 2024 14:09:16 +0800 Subject: [PATCH 1/2] Add icons.scss --- app/assets/stylesheets/shared/_icons.scss | 11 +++++++++++ app/assets/stylesheets/shared/_validations.scss | 17 +++-------------- app/assets/stylesheets/tylium.scss | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 app/assets/stylesheets/shared/_icons.scss diff --git a/app/assets/stylesheets/shared/_icons.scss b/app/assets/stylesheets/shared/_icons.scss new file mode 100644 index 000000000..d63fbacbf --- /dev/null +++ b/app/assets/stylesheets/shared/_icons.scss @@ -0,0 +1,11 @@ +.fa-check { + color: $green; +} + +.fa-info-circle { + color: $blue; +} + +.fa-times { + color: $red; +} diff --git a/app/assets/stylesheets/shared/_validations.scss b/app/assets/stylesheets/shared/_validations.scss index 5dcb09dcf..dec75f637 100644 --- a/app/assets/stylesheets/shared/_validations.scss +++ b/app/assets/stylesheets/shared/_validations.scss @@ -1,29 +1,18 @@ .validation { - .fa-check { - color: $green; - } - - .fa-info-circle { - color: $blue; - } - - .fa-times { - color: $red; - } - &.validation-feed { .validation-list { + list-style-type: none; margin: 1rem 0 0; padding: 0; li { i { - margin-right: .15rem; + margin-right: 0.15rem; } .text-error { font-size: 90%; - margin: 0 0 .5rem 1.3rem; + margin: 0 0 0.5rem 1.6rem; } &:last-of-type .text-error { diff --git a/app/assets/stylesheets/tylium.scss b/app/assets/stylesheets/tylium.scss index cba0d31e5..64cdfcd2c 100644 --- a/app/assets/stylesheets/tylium.scss +++ b/app/assets/stylesheets/tylium.scss @@ -23,6 +23,7 @@ @import 'shared/datatables'; @import 'shared/editor_toolbar'; @import 'shared/empty_state.scss'; +@import 'shared/icons'; @import 'shared/inline_editable'; @import 'shared/mixins'; @import 'shared/noscript'; From 0cc3c7be5ab8826b62e413fb98de53164c4c26b8 Mon Sep 17 00:00:00 2001 From: Matt Budz Date: Fri, 6 Sep 2024 15:36:39 +0200 Subject: [PATCH 2/2] hide dots headers when they don't have sub items --- app/assets/stylesheets/tylium/modules/_dots-menu.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/tylium/modules/_dots-menu.scss b/app/assets/stylesheets/tylium/modules/_dots-menu.scss index 00ef9293c..416083b4b 100644 --- a/app/assets/stylesheets/tylium/modules/_dots-menu.scss +++ b/app/assets/stylesheets/tylium/modules/_dots-menu.scss @@ -10,7 +10,7 @@ .dots-dropdown-header { font-weight: 400 !important; - + &:hover { color: $linkColor !important; background-color: initial !important; @@ -21,6 +21,10 @@ margin-top: 0.3rem; padding-top: 0.3rem; } + + &:not(:has(+ .dropdown-item)) { + display: none; + } } .dropdown-menu {