Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'theme-edit-color-fields' into 'develop'

Browse source 
HTML5  <input type="color"> for theme editing

See merge request pleroma/pleroma-fe!172
This commit is contained in:
eal 2018-02-04 14:42:04 +00:00
commit 7957489aa0
1 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/components/style_switcher/style_switcher.vue
View file

@ -7,20 +7,24 @@
<p>{{$t('settings.theme_help')}}</p> <p>{{$t('settings.theme_help')}}</p>
<div class="color-container"> <div class="color-container">
<div class="color-item"> <div class="color-item">
<label for="bgcolor" class="base04">{{$t('settings.background')}}</label> <label for="bgcolor" class="base04 theme-color-lb">{{$t('settings.background')}}</label>
<input id="bgcolor" class="theme-color-in" type="text" v-model="bgColorLocal"> <input id="bgcolor" class="theme-color-cl" type="color" v-model="bgColorLocal">
<input id="bgcolor-t" class="theme-color-in" type="text" v-model="bgColorLocal">
</div> </div>
<div class="color-item"> <div class="color-item">
<label for="fgcolor" class="base04">{{$t('settings.foreground')}}</label> <label for="fgcolor" class="base04 theme-color-lb">{{$t('settings.foreground')}}</label>
<input id="fgcolor" class="theme-color-in" type="text" v-model="fgColorLocal"> <input id="fgcolor" class="theme-color-cl" type="color" v-model="fgColorLocal">
<input id="fgcolor-t" class="theme-color-in" type="text" v-model="fgColorLocal">
</div> </div>
<div class="color-item"> <div class="color-item">
<label for="textcolor" class="base04">{{$t('settings.text')}}</label> <label for="textcolor" class="base04 theme-color-lb">{{$t('settings.text')}}</label>
<input id="textcolor" class="theme-color-in" type="text" v-model="textColorLocal"> <input id="textcolor" class="theme-color-cl" type="color" v-model="textColorLocal">
<input id="textcolor-t" class="theme-color-in" type="text" v-model="textColorLocal">
</div> </div>
<div class="color-item"> <div class="color-item">
<label for="linkcolor" class="base04">{{$t('settings.links')}}</label> <label for="linkcolor" class="base04 theme-color-lb">{{$t('settings.links')}}</label>
<input id="linkcolor" class="theme-color-in" type="text" v-model="linkColorLocal"> <input id="linkcolor" class="theme-color-cl" type="color" v-model="linkColorLocal">
<input id="linkcolor-t" class="theme-color-in" type="text" v-model="linkColorLocal">
</div> </div>
</div> </div>
<div> <div>
@ -43,27 +47,50 @@
<script src="./style_switcher.js"></script> <script src="./style_switcher.js"></script>
<style lang="scss"> <style lang="scss">
.style-switcher { .style-switcher {
margin-right: 1em; margin-right: 1em;
} }
.color-container { .color-container {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} justify-content: space-between;
}
.color-item { .color-item {
max-width: 9em; min-width: 20em;
display:flex; display:flex;
flex-wrap:wrap; flex: 1 1 0;
} align-items: baseline;
margin: 5px 6px 5px 0;
}
.theme-color-cl,
.theme-color-in {
margin-left: 4px;
border-radius: 2px;
border: 0;
}
.theme-color-in { .theme-color-in {
max-width: 8em; padding: 5px;
border-radius: 2px; min-width: 4em;
border: 0; max-width: 7em;
padding: 5px; flex: 1;
margin: 5px 0 5px 0; }
.theme-color-lb {
flex: 2;
min-width: 7em;
max-width: 10em;
}
.theme-color-cl {
padding: 1px;
max-width: 8em;
align-self: stretch;
height: 100%;
flex: 0;
min-width: 2em;
cursor: pointer;
} }
.theme-preview-content { .theme-preview-content {