diff --git a/assets/styles/themes/moonless_night.less b/assets/styles/themes/moonless_night.less index 6755b963e7..09cc92a8df 100644 --- a/assets/styles/themes/moonless_night.less +++ b/assets/styles/themes/moonless_night.less @@ -1,7 +1,10 @@ +:root { + --flair-color: #B53471; +} + .moonless_night { //------------- Colors ------------- @white: #fff; - @flair: #B53471; @background: #15161d; @midground: #000; @@ -11,7 +14,7 @@ //------------- Ui Colors ------------- @border-color: @gray; - @flair-glow: 0 5px 14px -5px @flair; + @flair-glow: 0 5px 14px -5px var(--flair-color); //------------- Ui Flair ------------- @border: 1px solid @border-color; @@ -20,7 +23,7 @@ .background { background: @midground !important; } .background-alt { background: @graydient !important; } - .flair { background: @flair !important; } + .flair { background: var(--flair-color) !important; } .flair-glow { box-shadow: @flair-glow !important; } .flair-glowing { @@ -35,7 +38,7 @@ } .menu-list li a.is-active { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; } @@ -44,7 +47,7 @@ color: @white !important; .selected { color: @white !important; - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; } } @@ -53,32 +56,32 @@ //------------- Navigation ------------- - a { - color: @flair !important; + .a_link { + color: var(--flair-color) !important; &:hover { - color: @flair !important; + color: var(--flair-color) !important; } } .alpha-divider { - color: @flair !important; + color: var(--flair-color) !important; } li .is-active, li.active { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; } .breadcrumb a { - color: @flair !important; + color: var(--flair-color) !important; } .toggle-sidebar, .toggle--sidebar, .menu-toggle { - color: @flair !important; + color: var(--flair-color) !important; } .sidebar-inner, .controls { @@ -92,29 +95,29 @@ } .multiselect__tags { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow; - border: @flair; + border: var(--flair-color); } .chip-item { - background: @flair !important; - border: @flair; + background: var(--flair-color) !important; + border: var(--flair-color); } .switch-button { - border-color: @flair !important; + border-color: var(--flair-color) !important; .sw-button { - border-color: @flair !important; - background: @flair !important; + border-color: var(--flair-color) !important; + background: var(--flair-color) !important; } &.enabled{ .sw-button { border-color: @white !important; background: @white !important; } - background: @flair !important; - border-color: @flair !important; + background: var(--flair-color) !important; + border-color: var(--flair-color) !important; } } #sidebar { @@ -132,7 +135,7 @@ } &.is-primary { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; } .tag-inverted { @@ -158,9 +161,9 @@ } &.active { border-radius: @half; - color: @flair !important; + color: var(--flair-color) !important; svg { - color: @flair !important; + color: var(--flair-color) !important; } } &:extend(.inline-flex-centered); @@ -179,7 +182,7 @@ .file { .file-icon { - color: @flair !important; + color: var(--flair-color) !important; } } @@ -193,7 +196,7 @@ #chatbar { .chatbar-controls { div[data-tooltip="Send"] { - color: @flair !important; + color: var(--flair-color) !important; } } } @@ -201,16 +204,16 @@ // Buttons .button { &.is-primary { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; color: @white !important; - background: @flair !important; + background: var(--flair-color) !important; } &.is-dark { background: @gray; } &.active { - background: @flair !important; + background: var(--flair-color) !important; box-shadow: @flair-glow !important; color: @white !important; } @@ -218,13 +221,13 @@ // Labels .label { - background: @flair !important; + background: var(--flair-color) !important; } // Media #mediastream { .user, .tag { - background: @flair !important; + background: var(--flair-color) !important; } .tag { box-shadow: @flair-glow !important; @@ -233,24 +236,24 @@ // Progress .progress { - border: @flair; + border: var(--flair-color); &.is-primary { - border-color: @flair !important; + border-color: var(--flair-color) !important; &::-webkit-progress-value { - background: @flair !important; + background: var(--flair-color) !important; } &::-moz-progress-bar { - background: @flair !important; + background: var(--flair-color) !important; } &::-ms-fill { - background: @flair !important; + background: var(--flair-color) !important; border: none; } } - border: 1px solid @flair; + border: 1px solid var(--flair-color); background: transparent; margin-bottom: @light-spacing; } @@ -261,9 +264,9 @@ .volume-slider .vue-slider-process, .vue-slider-dot-tooltip-inner { &::after { - border-left-color: @flair !important; + border-left-color: var(--flair-color) !important; } - background: @flair !important; + background: var(--flair-color) !important; } // Scrollbars @@ -275,19 +278,19 @@ .ps__rail-y:hover > .ps__thumb-y, .ps__rail-y:focus > .ps__thumb-y, .ps__rail-y.ps--clicking .ps__thumb-y { - background: @flair !important; + background: var(--flair-color) !important; } .auto-scroll { /* Scroll Handle */ &::-webkit-scrollbar-thumb { - background: @flair !important; + background: var(--flair-color) !important; } /* Custom Scroll for Firefox */ - scrollbar-color: @flair transparent !important; + scrollbar-color: var(--flair-color) transparent !important; } .new-message-alert { - background: @flair !important; + background: var(--flair-color) !important; } } \ No newline at end of file diff --git a/components/interactables/Select/Select.html b/components/interactables/Select/Select.html index d1216c16bc..50728b1b08 100644 --- a/components/interactables/Select/Select.html +++ b/components/interactables/Select/Select.html @@ -3,9 +3,7 @@ v-click-outside="() => open = false" >
-
- {{ getSelectLabel() }} -
+
{{ getSelectLabel() }}
- {{ option.text }} +
+ {{ option.text }} +
+ {{ option.text }}
diff --git a/components/interactables/Select/Select.less b/components/interactables/Select/Select.less index 4d3f8cac35..a2b19174af 100644 --- a/components/interactables/Select/Select.less +++ b/components/interactables/Select/Select.less @@ -42,6 +42,7 @@ &:extend(.round-corners); &:extend(.bordered); &:extend(.blur); + min-width: 8rem; position: absolute; display: none; color: #fff; diff --git a/components/interactables/Select/Select.vue b/components/interactables/Select/Select.vue index d6361bec4f..00b1fbce42 100644 --- a/components/interactables/Select/Select.vue +++ b/components/interactables/Select/Select.vue @@ -12,6 +12,10 @@ export default Vue.extend({ event: 'change', }, props: { + colorSupport: { + type: Boolean, + default: false, + }, placeholder: { type: String, default: '', diff --git a/components/ui/Chat/Image/Image.html b/components/ui/Chat/Image/Image.html index 84cdb1bcfb..7a2e7e8a3d 100644 --- a/components/ui/Chat/Image/Image.html +++ b/components/ui/Chat/Image/Image.html @@ -7,7 +7,7 @@ :class="`is-image-in-mask`" :src="image.url" v-click-outside="() => $data.showfull = !$data.showfull" /> - + {{ $t('files.view_original') }} diff --git a/components/views/settings/pages/personalize/Personalize.html b/components/views/settings/pages/personalize/Personalize.html index 271afd43ac..3c788f7681 100644 --- a/components/views/settings/pages/personalize/Personalize.html +++ b/components/views/settings/pages/personalize/Personalize.html @@ -19,6 +19,20 @@ +
+
+ +
+ +
+
+
diff --git a/components/views/settings/pages/personalize/index.vue b/components/views/settings/pages/personalize/index.vue index cd1817f991..fd67da39e5 100644 --- a/components/views/settings/pages/personalize/index.vue +++ b/components/views/settings/pages/personalize/index.vue @@ -3,13 +3,14 @@ diff --git a/layouts/chat.vue b/layouts/chat.vue index 8048bba0bc..095e06cc8c 100644 --- a/layouts/chat.vue +++ b/layouts/chat.vue @@ -30,7 +30,9 @@ :sidebar="sidebar" /> - +
+ + + :root { --flair-color: {{ $store.state.ui.theme.flair.value }}; } +
@@ -92,9 +98,7 @@ import { mapState } from 'vuex' import { Touch } from '~/components/mixins/Touch' import Layout from '~/components/mixins/Layouts/Layout' -import { - MenuIcon, -} from 'satellite-lucide-icons' +import { MenuIcon } from 'satellite-lucide-icons' export default Vue.extend({ name: 'ChatLayout', @@ -107,18 +111,18 @@ export default Vue.extend({ return { sidebar: true, asidebar: !this.$device.isMobile, - swiperOption: { + swiperOption: { initialSlide: 0, resistanceRatio: 0, slidesPerView: 'auto', noSwiping: this.$device.isMobile ? false : true, - allowTouchMove: this.$device.isMobile ? true : false, + allowTouchMove: this.$device.isMobile ? true : false, on: { slideChange: () => { this.$data.sidebar = this.$refs.swiper.$swiper.activeIndex === 0 this.$data.asidebar = this.$refs.swiper.$swiper.activeIndex === 2 - } - } + }, + }, }, } }, @@ -159,9 +163,9 @@ export default Vue.extend({ ? this.$refs.swiper.$swiper.slideNext() : this.$refs.swiper.$swiper.slidePrev() } - } + }, }, }) - \ No newline at end of file + diff --git a/layouts/default.vue b/layouts/default.vue index 2f4b138dca..347beeefe2 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,6 +1,10 @@