diff options
| author | Henry Jameson <me@hjkos.com> | 2018-11-23 07:28:53 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-11-23 07:28:53 +0300 |
| commit | 91ea9b7b0e7b2ad818c0ac026951cd5a9c68bfdf (patch) | |
| tree | acbaf8c3150445a58d03f26e604b97c98e4841b6 /src | |
| parent | d2f3b6d2442a04e6bcb244d0644c8c0dd6caa8fe (diff) | |
checkbox radius
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.scss | 4 | ||||
| -rw-r--r-- | src/_variables.scss | 2 | ||||
| -rw-r--r-- | src/components/style_switcher/style_switcher.js | 3 | ||||
| -rw-r--r-- | src/components/style_switcher/style_switcher.vue | 3 | ||||
| -rw-r--r-- | src/i18n/en.json | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/App.scss b/src/App.scss index 8732d23c..004c6fc3 100644 --- a/src/App.scss +++ b/src/App.scss @@ -178,8 +178,8 @@ input, textarea, .select { transition: color 200ms; width: 1.1em; height: 1.1em; - border-radius: $fallback--checkBoxRadius; - border-radius: var(--checkBoxRadius, $fallback--checkBoxRadius); + border-radius: $fallback--checkboxRadius; + border-radius: var(--checkboxRadius, $fallback--checkboxRadius); box-shadow: 0px 0px 2px black inset; box-shadow: var(--inputShadow); margin-right: .5em; diff --git a/src/_variables.scss b/src/_variables.scss index d0d91efe..150e4fb5 100644 --- a/src/_variables.scss +++ b/src/_variables.scss @@ -19,7 +19,7 @@ $fallback--cOrange: orange; $fallback--alertError: rgba(211,16,20,.5); $fallback--panelRadius: 10px; -$fallback--checkBoxRadius: 2px; +$fallback--checkboxRadius: 2px; $fallback--btnRadius: 4px; $fallback--inputRadius: 4px; $fallback--tooltipRadius: 5px; diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 710694d4..edc614c3 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -76,6 +76,7 @@ export default { btnRadiusLocal: '', inputRadiusLocal: '', + checkboxRadiusLocal: '', panelRadiusLocal: '', avatarRadiusLocal: '', avatarAltRadiusLocal: '', @@ -154,6 +155,7 @@ export default { return { btn: this.btnRadiusLocal, input: this.inputRadiusLocal, + checkbox: this.checkboxRadiusLocal, panel: this.panelRadiusLocal, avatar: this.avatarRadiusLocal, avatarAlt: this.avatarAltRadiusLocal, @@ -421,6 +423,7 @@ export default { // TODO optimize this this.btnRadiusLocal = radii.btn this.inputRadiusLocal = radii.input + this.checkboxRadiusLocal = radii.checkbox this.panelRadiusLocal = radii.panel this.avatarRadiusLocal = radii.avatar this.avatarAltRadiusLocal = radii.avatarAlt diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 37709363..6463a4ca 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -135,7 +135,8 @@ <div> <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="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="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"/> diff --git a/src/i18n/en.json b/src/i18n/en.json index b039757e..f990dd04 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -114,6 +114,7 @@ "import_followers_from_a_csv_file": "Import follows from a csv file", "import_theme": "Load preset", "inputRadius": "Input fields", + "checkboxRadius": "Checkboxes", "instance_default": "(default: {value})", "interfaceLanguage": "Interface language", "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", |