Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Themes): added custom flair color selector #802

Merged
merged 4 commits into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/styles/platforms/iOS.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@supports (-webkit-touch-callout: none) {
html {
min-height: calc(@full + env(safe-area-inset-top) - 11px);
min-height: calc(@full + env(safe-area-inset-top));
padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
}
#app {
Expand Down
89 changes: 46 additions & 43 deletions assets/styles/themes/moonless_night.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
:root {
--flair-color: #B53471;
}

.moonless_night {
//------------- Colors -------------
@white: #fff;
@flair: #2ed573;

@background: #15161d;
@midground: #000;
Expand All @@ -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;
Expand All @@ -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 {
Expand All @@ -35,7 +38,7 @@
}

.menu-list li a.is-active {
background: @flair !important;
background: var(--flair-color) !important;
box-shadow: @flair-glow !important;
}

Expand All @@ -44,7 +47,7 @@
color: @white !important;
.selected {
color: @white !important;
background: @flair !important;
background: var(--flair-color) !important;
box-shadow: @flair-glow !important;
}
}
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -132,7 +135,7 @@
}

&.is-primary {
background: @flair !important;
background: var(--flair-color) !important;
box-shadow: @flair-glow !important;
}
.tag-inverted {
Expand All @@ -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);
Expand All @@ -179,7 +182,7 @@

.file {
.file-icon {
color: @flair !important;
color: var(--flair-color) !important;
}
}

Expand All @@ -193,38 +196,38 @@
#chatbar {
.chatbar-controls {
div[data-tooltip="Send"] {
color: @flair !important;
color: var(--flair-color) !important;
}
}
}

// 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;
}
}

// 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;
Expand All @@ -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;
}
Expand All @@ -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
Expand All @@ -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;
}
}
13 changes: 9 additions & 4 deletions components/interactables/Select/Select.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@
v-click-outside="() => open = false"
>
<div :class="{'custom-select': true, open, up, down: !up}">
<div class="selected" @click="toggleOpen()">
{{ getSelectLabel() }}
</div>
<div class="selected" @click="toggleOpen()">{{ getSelectLabel() }}</div>
<div class="items">
<div
v-for="(option, i) of options"
:key="i"
:disabled="option.disabled"
@click="change(option)"
>
{{ option.text }}
<div
class="color"
v-if="colorSupport"
:style="{ background: option.value }"
>
{{ option.text }}
</div>
<span v-else>{{ option.text }}</span>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions components/interactables/Select/Select.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
&:extend(.round-corners);
&:extend(.bordered);
&:extend(.blur);
min-width: 8rem;
position: absolute;
display: none;
color: #fff;
Expand Down
4 changes: 4 additions & 0 deletions components/interactables/Select/Select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ export default Vue.extend({
event: 'change',
},
props: {
colorSupport: {
type: Boolean,
default: false,
},
placeholder: {
type: String,
default: '',
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Chat/Image/Image.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:class="`is-image-in-mask`"
:src="image.url"
v-click-outside="() => $data.showfull = !$data.showfull" />
<a :href="image.url" target="_blank">
<a class="a_link" :href="image.url" target="_blank">
{{ $t('files.view_original') }}
</a>
</div>
Expand Down
1 change: 1 addition & 0 deletions components/views/friends/add/Add.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
margin: 0 @normal-spacing;
}
padding: @normal-spacing;
padding-top: 0;
}

@media only screen and (max-width: @mobile-breakpoint) {
Expand Down
14 changes: 14 additions & 0 deletions components/views/settings/pages/personalize/Personalize.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
</div>
</div>

<div class="columns is-desktop">
<div class="column">
<TypographyLabel :text="$t('pages.settings.personalize.flair')" />
<br />
<InteractablesSelect
v-model="flair"
size="small"
:options="flairs"
colorSupport
:selected="ui.theme.flair.value"
/>
</div>
</div>

<div class="columns is-desktop">
<div class="column">
<TypographyLabel :text="$t('pages.settings.personalize.language')" />
Expand Down
Loading