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

checkbox radius

This commit is contained in:
Henry Jameson 2018-11-23 07:28:53 +03:00
parent d2f3b6d244
commit 91ea9b7b0e
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.scss
View File

@ -178,8 +178,8 @@ input, textarea, .select {
transition: color 200ms; transition: color 200ms;
width: 1.1em; width: 1.1em;
height: 1.1em; height: 1.1em;
border-radius: $fallback--checkBoxRadius; border-radius: $fallback--checkboxRadius;
border-radius: var(--checkBoxRadius, $fallback--checkBoxRadius); border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
box-shadow: 0px 0px 2px black inset; box-shadow: 0px 0px 2px black inset;
box-shadow: var(--inputShadow); box-shadow: var(--inputShadow);
margin-right: .5em; margin-right: .5em;

2
src/_variables.scss
View File

@ -19,7 +19,7 @@ $fallback--cOrange: orange;
$fallback--alertError: rgba(211,16,20,.5); $fallback--alertError: rgba(211,16,20,.5);
$fallback--panelRadius: 10px; $fallback--panelRadius: 10px;
$fallback--checkBoxRadius: 2px; $fallback--checkboxRadius: 2px;
$fallback--btnRadius: 4px; $fallback--btnRadius: 4px;
$fallback--inputRadius: 4px; $fallback--inputRadius: 4px;
$fallback--tooltipRadius: 5px; $fallback--tooltipRadius: 5px;

3
src/components/style_switcher/style_switcher.js
View File

@ -76,6 +76,7 @@ export default {
btnRadiusLocal: '', btnRadiusLocal: '',
inputRadiusLocal: '', inputRadiusLocal: '',
checkboxRadiusLocal: '',
panelRadiusLocal: '', panelRadiusLocal: '',
avatarRadiusLocal: '', avatarRadiusLocal: '',
avatarAltRadiusLocal: '', avatarAltRadiusLocal: '',
@ -154,6 +155,7 @@ export default {
return { return {
btn: this.btnRadiusLocal, btn: this.btnRadiusLocal,
input: this.inputRadiusLocal, input: this.inputRadiusLocal,
checkbox: this.checkboxRadiusLocal,
panel: this.panelRadiusLocal, panel: this.panelRadiusLocal,
avatar: this.avatarRadiusLocal, avatar: this.avatarRadiusLocal,
avatarAlt: this.avatarAltRadiusLocal, avatarAlt: this.avatarAltRadiusLocal,
@ -421,6 +423,7 @@ export default {
// TODO optimize this // TODO optimize this
this.btnRadiusLocal = radii.btn this.btnRadiusLocal = radii.btn
this.inputRadiusLocal = radii.input this.inputRadiusLocal = radii.input
this.checkboxRadiusLocal = radii.checkbox
this.panelRadiusLocal = radii.panel this.panelRadiusLocal = radii.panel
this.avatarRadiusLocal = radii.avatar this.avatarRadiusLocal = radii.avatar
this.avatarAltRadiusLocal = radii.avatarAlt this.avatarAltRadiusLocal = radii.avatarAlt

3
src/components/style_switcher/style_switcher.vue
View File

@ -135,7 +135,8 @@
<div> <div>
<p>{{$t('settings.radii_help')}}</p> <p>{{$t('settings.radii_help')}}</p>
<RangeInput name="btnRadius" :label="$t('settings.btnRadius')" v-model="btnRadiusLocal" :fallback="previewTheme.radii.btn" max="16" hardMin="0"/> <RangeInput name="btnRadius" :label="$t('settings.btnRadius')" v-model="btnRadiusLocal" :fallback="previewTheme.radii.btn" max="16" hardMin="0"/>
<RangeInput name="inputRadius" :label="$t('settings.inputRadius')" v-model="inputRadiusLocal" :fallback="previewTheme.radii.input" max="16" hardMin="0"/> <RangeInput name="inputRadius" :label="$t('settings.inputRadius')" v-model="inputRadiusLocal" :fallback="previewTheme.radii.input" max="9" hardMin="0"/>
<RangeInput name="checkboxRadius" :label="$t('settings.checkboxRadius')" v-model="checkboxRadiusLocal" :fallback="previewTheme.radii.checkbox" max="16" hardMin="0"/>
<RangeInput name="panelRadius" :label="$t('settings.panelRadius')" v-model="panelRadiusLocal" :fallback="previewTheme.radii.panel" max="50" hardMin="0"/> <RangeInput name="panelRadius" :label="$t('settings.panelRadius')" v-model="panelRadiusLocal" :fallback="previewTheme.radii.panel" max="50" hardMin="0"/>
<RangeInput name="avatarRadius" :label="$t('settings.avatarRadius')" v-model="avatarRadiusLocal" :fallback="previewTheme.radii.avatar" max="28" hardMin="0"/> <RangeInput name="avatarRadius" :label="$t('settings.avatarRadius')" v-model="avatarRadiusLocal" :fallback="previewTheme.radii.avatar" max="28" hardMin="0"/>
<RangeInput name="avatarAltRadius" :label="$t('settings.avatarAltRadius')" v-model="avatarAltRadiusLocal" :fallback="previewTheme.radii.avatarAlt" max="28" hardMin="0"/> <RangeInput name="avatarAltRadius" :label="$t('settings.avatarAltRadius')" v-model="avatarAltRadiusLocal" :fallback="previewTheme.radii.avatarAlt" max="28" hardMin="0"/>

1
src/i18n/en.json
View File

@ -114,6 +114,7 @@
"import_followers_from_a_csv_file": "Import follows from a csv file", "import_followers_from_a_csv_file": "Import follows from a csv file",
"import_theme": "Load preset", "import_theme": "Load preset",
"inputRadius": "Input fields", "inputRadius": "Input fields",
"checkboxRadius": "Checkboxes",
"instance_default": "(default: {value})", "instance_default": "(default: {value})",
"interfaceLanguage": "Interface language", "interfaceLanguage": "Interface language",
"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",

3
static/styles.json
View File

@ -271,6 +271,7 @@
"radii": { "radii": {
"btn": "0", "btn": "0",
"input": "0", "input": "0",
"checkbox": "0",
"panel": "0", "panel": "0",
"avatar": "0", "avatar": "0",
"avatarAlt": "0", "avatarAlt": "0",
@ -555,6 +556,7 @@
"radii": { "radii": {
"btn": "0", "btn": "0",
"input": "0", "input": "0",
"checkbox": "0",
"panel": "0", "panel": "0",
"avatar": "0", "avatar": "0",
"avatarAlt": "0", "avatarAlt": "0",
@ -839,6 +841,7 @@
"radii": { "radii": {
"btn": "0", "btn": "0",
"input": "0", "input": "0",
"checkbox": "0",
"panel": "0", "panel": "0",
"avatar": "0", "avatar": "0",
"avatarAlt": "0", "avatarAlt": "0",