moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency.

This commit is contained in:
shpuld 2017-11-17 02:17:36 +02:00
parent ed84c6acc0
commit 44073e72fd
11 changed files with 122 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div id="app" v-bind:style="style" class="base02-background"> <div id="app" v-bind:style="style" class="base02-background">
<nav class='container base01-background base04' @click="scrollToTop()" id="nav"> <nav class='container base02-background base05' @click="scrollToTop()" id="nav">
<div class='inner-nav' :style="logoStyle"> <div class='inner-nav' :style="logoStyle">
<div class='item'> <div class='item'>
<router-link :to="{ name: 'root'}">{{sitename}}</router-link> <router-link :to="{ name: 'root'}">{{sitename}}</router-link>
@ -14,8 +14,8 @@
</nav> </nav>
<div class="container" id="content"> <div class="container" id="content">
<div class="panel-switcher"> <div class="panel-switcher">
<button @click="activatePanel('sidebar')" class="base01-background base04">Sidebar</button> <button @click="activatePanel('sidebar')" class="base02-background base05">Sidebar</button>
<button @click="activatePanel('timeline')" class="base01-background base04">Timeline</button> <button @click="activatePanel('timeline')" class="base02-background base05">Timeline</button>
</div> </div>
<div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}">
<div class="sidebar-bounds"> <div class="sidebar-bounds">

2
src/components/conversation/conversation.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="timeline panel panel-default"> <div class="timeline panel panel-default">
<div class="panel-heading base01-background base04 base03-border conversation-heading"> <div class="panel-heading base02-background base04 base03-border conversation-heading">
{{ $t('timeline.conversation') }} {{ $t('timeline.conversation') }}
<span v-if="collapsable" style="float:right;"> <span v-if="collapsable" style="float:right;">
<small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>

4
src/components/login_form/login_form.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="login panel panel-default base00-background"> <div class="login panel panel-default base00-background">
<!-- Default panel contents --> <!-- Default panel contents -->
<div class="panel-heading base01-background base04"> <div class="panel-heading base02-background base04">
{{$t('login.login')}} {{$t('login.login')}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -17,7 +17,7 @@
<div class='form-group'> <div class='form-group'>
<div class='login-bottom'> <div class='login-bottom'>
<div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>{{$t('login.register')}}</router-link></div> <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>{{$t('login.register')}}</router-link></div>
<button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>{{$t('login.login')}}</button> <button :disabled="loggingIn" type='submit' class='btn btn-default base04 base02-background'>{{$t('login.login')}}</button>
</div> </div>
</div> </div>
<div v-if="authError" class='form-group'> <div v-if="authError" class='form-group'>

4
src/components/notifications/notifications.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="notifications"> <div class="notifications">
<div class="panel panel-default base00-background"> <div class="panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base02-background base04">
<span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span> <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span>
{{$t('notifications.notifications')}} {{$t('notifications.notifications')}}
<button @click.prevent="markAsSeen" class="base05 base01-background read-button">{{$t('notifications.read')}}</button> <button @click.prevent="markAsSeen" class="base04 base02-background read-button">{{$t('notifications.read')}}</button>
</div> </div>
<div class="panel-body base03-border"> <div class="panel-body base03-border">
<div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'> <div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'>

6
src/components/post_status_form/post_status_form.vue
View File

@ -6,7 +6,7 @@
</div> </div>
<div style="position:relative;" v-if="candidates"> <div style="position:relative;" v-if="candidates">
<div class="autocomplete-panel base05-background"> <div class="autocomplete-panel base05-background">
<div v-for="candidate in candidates" @click="replace(candidate.screen_name + ' ')" class="autocomplete base01"> <div v-for="candidate in candidates" @click="replace(candidate.screen_name + ' ')" class="autocomplete base02">
<img :src="candidate.img"></img> <img :src="candidate.img"></img>
<span> <span>
{{candidate.screen_name}} {{candidate.screen_name}}
@ -17,8 +17,8 @@
</div> </div>
<div class='form-bottom'> <div class='form-bottom'>
<media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload> <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
<button v-if="posting" disabled class="btn btn-default base05 base01-background">{{$t('post_status.posting')}}</button> <button v-if="posting" disabled class="btn btn-default base05 base02-background">{{$t('post_status.posting')}}</button>
<button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">{{$t('general.submit')}}</button> <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base02-background">{{$t('general.submit')}}</button>
</div> </div>
<div class='error' v-if="error"> <div class='error' v-if="error">
Error: {{ error }} Error: {{ error }}

4
src/components/registration/registration.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="settings panel panel-default base00-background"> <div class="settings panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base02-background base04">
{{$t('registration.registration')}} {{$t('registration.registration')}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -39,7 +39,7 @@
</div> </div>
--> -->
<div class='form-group'> <div class='form-group'>
<button :disabled="registering" type='submit' class='btn btn-default base05 base01-background'>{{$t('general.submit')}}</button> <button :disabled="registering" type='submit' class='btn btn-default base05 base02-background'>{{$t('general.submit')}}</button>
</div> </div>
</div> </div>
<div class='terms-of-service' v-html="termsofservice"> <div class='terms-of-service' v-html="termsofservice">

15
src/components/settings/settings.js
View File

@ -13,6 +13,7 @@ const settings = {
hoverPreviewLocal: this.$store.state.config.hoverPreview, hoverPreviewLocal: this.$store.state.config.hoverPreview,
bgColorLocal: '', bgColorLocal: '',
fgColorLocal: '', fgColorLocal: '',
textColorLocal: '',
linkColorLocal: '' linkColorLocal: ''
} }
}, },
@ -24,6 +25,18 @@ const settings = {
return this.$store.state.users.currentUser return this.$store.state.users.currentUser
} }
}, },
mounted() {
const rgbstr2hex = (rgb) => {
if (rgb[0] === '#')
return rgb
rgb = rgb.match(/\d+/g)
return `#${((Number(rgb[0]) << 16) + (Number(rgb[1]) << 8) + Number(rgb[2])).toString(16)}`
}
this.bgColorLocal = rgbstr2hex(this.$store.state.config.colors['base00'])
this.fgColorLocal = rgbstr2hex(this.$store.state.config.colors['base02'])
this.textColorLocal = rgbstr2hex(this.$store.state.config.colors['base05'])
this.linkColorLocal = rgbstr2hex(this.$store.state.config.colors['base08'])
},
methods: { methods: {
setCustomTheme () { setCustomTheme () {
if (!this.bgColorLocal && !this.fgColorLocal && !this.linkColorLocal) { if (!this.bgColorLocal && !this.fgColorLocal && !this.linkColorLocal) {
@ -39,12 +52,14 @@ const settings = {
} }
const bgRgb = rgb(this.bgColorLocal) const bgRgb = rgb(this.bgColorLocal)
const fgRgb = rgb(this.fgColorLocal) const fgRgb = rgb(this.fgColorLocal)
const textRgb = rgb(this.textColorLocal)
const linkRgb = rgb(this.linkColorLocal) const linkRgb = rgb(this.linkColorLocal)
if (bgRgb && fgRgb && linkRgb) { if (bgRgb && fgRgb && linkRgb) {
console.log('all colors ok') console.log('all colors ok')
this.$store.dispatch('setOption', { name: 'customTheme', value: { this.$store.dispatch('setOption', { name: 'customTheme', value: {
fg: fgRgb, fg: fgRgb,
bg: bgRgb, bg: bgRgb,
text: textRgb,
link: linkRgb link: linkRgb
}}) }})
} }

60
src/components/settings/settings.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="settings panel panel-default base00-background"> <div class="settings panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base02-background base04">
{{$t('settings.settings')}} {{$t('settings.settings')}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -11,10 +11,38 @@
<div class="setting-item"> <div class="setting-item">
<h3>Custom theme</h3> <h3>Custom theme</h3>
<p>Enter hex color codes (#aabbcc) into the text fields.</p> <p>Enter hex color codes (#aabbcc) into the text fields.</p>
<input type="text" placeholder="Background" v-model="bgColorLocal"> <div class="color-container">
<input type="text" placeholder="Foreground" v-model="fgColorLocal"> <div class="color-item">
<input type="text" placeholder="Highlight" v-model="linkColorLocal"> <label for="bgcolor" class="base04">Background</label>
<button @click="setCustomTheme">Submit</button> <input id="bgcolor" class="theme-color-in" type="text" v-model="bgColorLocal">
</div>
<div class="color-item">
<label for="fgcolor" class="base04">Foreground</label>
<input id="fgcolor" class="theme-color-in" type="text" v-model="fgColorLocal">
</div>
<div class="color-item">
<label for="textcolor" class="base04">Text</label>
<input id="textcolor" class="theme-color-in" type="text" v-model="textColorLocal">
</div>
<div class="color-item">
<label for="linkcolor" class="base04">Links</label>
<input id="linkcolor" class="theme-color-in" type="text" v-model="linkColorLocal">
</div>
</div>
<div>
<div class="panel">
<div class="panel-heading" :style="{ 'background-color': fgColorLocal, 'color': textColorLocal }">Preview</div>
<div class="panel-body theme-preview-content" :style="{ 'background-color': bgColorLocal, 'color': textColorLocal }">
<h4>Content</h4>
<br>
A bunch of more content and
<a :style="{ 'color': linkColorLocal }">a nice lil' link</a>
<br>
<button class="btn" :style="{ 'background-color': fgColorLocal, 'color': textColorLocal }">Button</button>
</div>
</div>
</div>
<button class="btn base02-background base04" @click="setCustomTheme">Submit</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h2>{{$t('settings.filtering')}}</h2> <h2>{{$t('settings.filtering')}}</h2>
@ -86,4 +114,26 @@
.setting-list { .setting-list {
list-style-type: none; list-style-type: none;
} }
.color-container {
display: flex;
}
.color-item {
max-width: 7em;
display:flex;
flex-wrap:wrap;
}
.theme-color-in {
max-width: 6em;
border-radius: 2px;
border: 0;
padding: 5px;
margin: 5px 0 5px 0;
}
.theme-preview-content {
padding: 20px;
}
</style> </style>

14
src/components/timeline/timeline.vue
View File

@ -1,16 +1,16 @@
<template> <template>
<div class="timeline panel panel-default" v-if="viewing == 'statuses'"> <div class="timeline panel panel-default" v-if="viewing == 'statuses'">
<div class="panel-heading timeline-heading base01-background base04"> <div class="panel-heading timeline-heading base02-background base04">
<div class="title"> <div class="title">
{{title}} {{title}}
</div> </div>
<button @click.prevent="showNewStatuses" class="base05 base01-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}} ({{timeline.newStatusCount}}) {{$t('timeline.show_new')}} ({{timeline.newStatusCount}})
</button> </button>
<div @click.prevent class="base06 error loadmore-text" v-if="timelineError"> <div @click.prevent class="base06 error loadmore-text" v-if="timelineError">
{{$t('timeline.error_fetching')}} {{$t('timeline.error_fetching')}}
</div> </div>
<div @click.prevent class="base04 base01-background loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError"> <div @click.prevent class="base04 base02-background loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.up_to_date')}} {{$t('timeline.up_to_date')}}
</div> </div>
</div> </div>
@ -18,14 +18,14 @@
<div class="timeline"> <div class="timeline">
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
<div class="base01-background base03-border new-status-notification text-center">{{$t('timeline.load_older')}}</div> <div class="base02-background base03-border new-status-notification text-center">{{$t('timeline.load_older')}}</div>
</a> </a>
<div class="base01-background base03-border new-status-notification text-center" v-else>...</div> <div class="base02-background base03-border new-status-notification text-center" v-else>...</div>
</div> </div>
</div> </div>
</div> </div>
<div class="timeline panel panel-default" v-else-if="viewing == 'followers'"> <div class="timeline panel panel-default" v-else-if="viewing == 'followers'">
<div class="panel-heading timeline-heading base01-background base04"> <div class="panel-heading timeline-heading base02-background base04">
<div class="title"> <div class="title">
{{$t('user_card.followers')}} {{$t('user_card.followers')}}
</div> </div>
@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<div class="timeline panel panel-default" v-else-if="viewing == 'friends'"> <div class="timeline panel panel-default" v-else-if="viewing == 'friends'">
<div class="panel-heading timeline-heading base01-background base04"> <div class="panel-heading timeline-heading base02-background base04">
<div class="title"> <div class="title">
{{$t('user_card.followees')}} {{$t('user_card.followees')}}
</div> </div>

10
src/components/user_settings/user_settings.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="settings panel panel-default base00-background"> <div class="settings panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base02-background base04">
{{$t('settings.user_settings')}} {{$t('settings.user_settings')}}
</div> </div>
<div class="panel-body profile-edit"> <div class="panel-body profile-edit">
@ -10,7 +10,7 @@
<input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input> <input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input>
<p>{{$t('settings.bio')}}</p> <p>{{$t('settings.bio')}}</p>
<textarea class="bio base03-border" v-model="newbio"></textarea> <textarea class="bio base03-border" v-model="newbio"></textarea>
<button :disabled='newname.length <= 0' class="btn btn-default base05 base01-background" @click="updateProfile">{{$t('general.submit')}}</button> <button :disabled='newname.length <= 0' class="btn btn-default base05 base02-background" @click="updateProfile">{{$t('general.submit')}}</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h3>{{$t('settings.avatar')}}</h3> <h3>{{$t('settings.avatar')}}</h3>
@ -23,7 +23,7 @@
<input type="file" @change="uploadFile(0, $event)" ></input> <input type="file" @change="uploadFile(0, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i> <i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button> <button class="btn btn-default base05 base02-background" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h3>{{$t('settings.profile_banner')}}</h3> <h3>{{$t('settings.profile_banner')}}</h3>
@ -36,7 +36,7 @@
<input type="file" @change="uploadFile(1, $event)" ></input> <input type="file" @change="uploadFile(1, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i> <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button> <button class="btn btn-default base05 base02-background" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h3>{{$t('settings.profile_background')}}</h3> <h3>{{$t('settings.profile_background')}}</h3>
@ -47,7 +47,7 @@
<input type="file" @change="uploadFile(2, $event)" ></input> <input type="file" @change="uploadFile(2, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i> <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button> <button class="btn btn-default base05 base02-background" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button>
</div> </div>
</div> </div>
</div> </div>

45
src/services/style_setter/style_setter.js
View File

@ -1,4 +1,4 @@
import { times } from 'lodash' import { times, map } from 'lodash'
const setStyle = (href, col, commit) => { const setStyle = (href, col, commit) => {
/*** /***
@ -50,6 +50,11 @@ const setStyle = (href, col, commit) => {
} }
const rgb2hex = (r, g, b) => { const rgb2hex = (r, g, b) => {
[r, g, b] = map([r, g, b], (val) => {
val = val < 0 ? 0 : val
val = val > 255 ? 255 : val
return val
})
return `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)}` return `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)}`
} }
@ -58,32 +63,36 @@ const setStyle = (href, col, commit) => {
head.appendChild(styleEl) head.appendChild(styleEl)
const styleSheet = styleEl.sheet const styleSheet = styleEl.sheet
const isDark = (col.fg.r + col.fg.g + col.fg.b) > (col.bg.r + col.bg.g + col.bg.b) const isDark = (col.text.r + col.text.g + col.text.b) > (col.bg.r + col.bg.g + col.bg.b)
let colors = {} let colors = {}
times(4, (n) => { let mod = 10
const nameLow = `base0${n.toString(16).toUpperCase()}` if (isDark) {
const nameHigh = `base0${(n + 4).toString(16).toUpperCase()}` mod = mod * -1
if (isDark) { }
colors[nameLow] = rgb2hex(col.bg.r + 10 * n, col.bg.g + 10 * n, col.bg.b + 10 * n) colors['base00'] = rgb2hex(col.bg.r, col.bg.g, col.bg.b) // background
colors[nameHigh] = rgb2hex(col.fg.r - 10 * n, col.fg.g - 10 * n, col.fg.b - 10 * n) colors['base01'] = rgb2hex(col.bg.r - mod, col.bg.g - mod, col.bg.b - mod) // hilighted bg
} else { colors['base02'] = rgb2hex(col.fg.r, col.fg.g, col.fg.b) // panels & buttons
colors[nameLow] = rgb2hex(col.bg.r - 10 * n, col.bg.g - 10 * n, col.bg.b - 10 * n) colors['base03'] = rgb2hex(col.fg.r - mod, col.fg.g - mod, col.fg.b - mod) // borders
colors[nameHigh] = rgb2hex(col.fg.r + 10 * n, col.fg.g + 10 * n, col.fg.b + 10 * n) colors['base04'] = rgb2hex(col.text.r + mod, col.text.g + mod, col.text.b + mod) // faint text
} colors['base05'] = rgb2hex(col.text.r, col.text.g, col.text.b) // text
styleSheet.insertRule(`.${nameLow} { color: ${colors[nameLow]}`, 'index-max') colors['base06'] = rgb2hex(col.text.r - mod, col.text.g - mod, col.text.b - mod) // strong text
styleSheet.insertRule(`.${nameHigh} { color: ${colors[nameHigh]}`, 'index-max') colors['base07'] = rgb2hex(col.text.r - mod * 2, col.text.g - mod * 2, col.text.b - mod * 2)
styleSheet.insertRule(`.${nameLow}-background { background-color: ${colors[nameLow]}`, 'index-max') colors['base08'] = rgb2hex(col.link.r, col.link.g, col.link.b) // links
styleSheet.insertRule(`.${nameHigh}-background { background-color: ${colors[nameHigh]}`, 'index-max')
times(9, (n) => {
const color = colors[`base0${n}`]
styleSheet.insertRule(`.base0${n} { color: ${color}`, 'index-max')
styleSheet.insertRule(`.base0${n}-background { background-color: ${color}`, 'index-max')
}) })
colors['base08'] = rgb2hex(col.link.r, col.link.g, col.link.b)
commit('setOption', { name: 'colors', value: colors }) commit('setOption', { name: 'colors', value: colors })
console.log(colors)
styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max') styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max')
styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max') styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max')
styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max') styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max')
styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, 'index-max') styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, 'index-max')
console.log(styleSheet)
body.style.display = 'initial' body.style.display = 'initial'
} }
if (col) { if (col) {