diff --git a/src/App.scss b/src/App.scss index 8732d23c0bb457ca53014ed27804e002745adb2a..004c6fc36db313c0d77102e836f55811d652dc59 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 d0d91efefcf52c8c96b97c2752eb5192ba128ea0..150e4fb56a0d9d818cf6e6009dd5a3973f7b378b 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 710694d483dd7e2594f5f03c5f620babf22e5221..edc614c38a06a086f4d74ee8003395367471188b 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 37709363c901a77b179c233b46e8f4d21a36331b..6463a4cab96205b1016713632b7f24bdafdb1be5 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 b039757e8eb72d4117d446962227325531a87c28..f990dd044460ce81edc9275eaedec09383903387 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.", diff --git a/static/styles.json b/static/styles.json index d9e1ea8c9e4c6d5f13ce66818a3b59281021a413..a53eeaa139c98d8c018c3e5466e6da8d32bd617b 100644 --- a/static/styles.json +++ b/static/styles.json @@ -271,6 +271,7 @@ "radii": { "btn": "0", "input": "0", + "checkbox": "0", "panel": "0", "avatar": "0", "avatarAlt": "0", @@ -555,6 +556,7 @@ "radii": { "btn": "0", "input": "0", + "checkbox": "0", "panel": "0", "avatar": "0", "avatarAlt": "0", @@ -839,6 +841,7 @@ "radii": { "btn": "0", "input": "0", + "checkbox": "0", "panel": "0", "avatar": "0", "avatarAlt": "0",