@@ -38,10 +34,7 @@
v-else
:to="userProfileLink(user)"
>
-
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 66ddb4139..a85746332 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -321,7 +321,8 @@
"auto_save_nothing_new": "Nothing new to save.",
"auto_save_saved": "Saved.",
"auto_save_saving": "Saving...",
- "save_to_drafts_button": "Save to drafts"
+ "save_to_drafts_button": "Save to drafts",
+ "save_to_drafts_and_close_button": "Save to drafts and close"
},
"registration": {
"bio_optional": "Bio (optional)",
@@ -381,6 +382,7 @@
"actor_type_Person": "a normal user",
"actor_type_Service": "a bot",
"actor_type_Group": "a group",
+ "mobile_center_dialog": "Vertically center dialogs on mobile",
"app_name": "App name",
"expert_mode": "Show advanced",
"save": "Save changes",
@@ -867,7 +869,8 @@
"lookup_local_fonts": "Load list of fonts installed on this computer",
"enter_manually": "Enter font name family manually",
"entry": "Enter {fontFamily}",
- "select": "Select font"
+ "select": "Select font",
+ "label": "{label} font"
}
},
"interface_font_user_override": "Override theme/browser font used",
@@ -1243,7 +1246,7 @@
"status_unavailable": "Status unavailable",
"copy_link": "Copy link to status",
"external_source": "External source",
- "muted_words": "Wordfiltered: {word} | Wordfiltered: {word} and {numWordsMore} more word",
+ "muted_words": "Wordfiltered: {word} | Wordfiltered: {word} and {numWordsMore} more words",
"multi_reason_mute": "{main} | {main} + one more reason | {main} + {numReasonsMore} more reasons",
"thread_muted": "Thread muted",
"thread_muted_and_words": ", has words:",
diff --git a/src/modules/config.js b/src/modules/config.js
index e1e395855..0543062c1 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -142,6 +142,7 @@ export const defaultState = {
modalOnApproveFollow: undefined, // instance default
modalOnDenyFollow: undefined, // instance default
modalOnRemoveUserFromFollowers: undefined, // instance default
+ modalMobileCenter: undefined,
playVideosInModal: false,
useOneClickNsfw: false,
useContainFit: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 72e34628e..7f920eaac 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -82,6 +82,7 @@ const defaultState = {
modalOnApproveFollow: false,
modalOnDenyFollow: false,
modalOnRemoveUserFromFollowers: false,
+ modalMobileCenter: false,
loginMethod: 'password',
logo: '/static/logo.svg',
logoMargin: '.2em',
diff --git a/src/services/theme_data/theme3_slot_functions.js b/src/services/theme_data/theme3_slot_functions.js
index ae644763a..89bcd21e1 100644
--- a/src/services/theme_data/theme3_slot_functions.js
+++ b/src/services/theme_data/theme3_slot_functions.js
@@ -81,9 +81,27 @@ export const colorFunctions = {
return alphaBlend(background, amount, foreground)
}
},
+ boost: {
+ argsNeeded: 2,
+ documentation: 'If given color is dark makes it darker, if color is light - makes it lighter',
+ args: [
+ 'color: source color',
+ 'amount: how much darken/brighten the color'
+ ],
+ exec: (args, { findColor }, { dynamicVars, staticVars }) => {
+ const [colorArg, amountArg] = args
+
+ const color = convert(findColor(colorArg, { dynamicVars, staticVars })).rgb
+ const amount = Number(amountArg)
+
+ const isLight = relativeLuminance(color) < 0.5
+ const mod = isLight ? -1 : 1
+ return brightness(amount * mod, color).rgb
+ }
+ },
mod: {
argsNeeded: 2,
- documentation: 'Old function that increases or decreases brightness depending if color is dark or light. Advised against using it as it might give unexpected results.',
+ documentation: 'Old function that increases or decreases brightness depending if background color is dark or light. Advised against using it as it might give unexpected results.',
args: [
'color: source color',
'amount: how much darken/brighten the color'
@@ -109,6 +127,7 @@ export const shadowFunctions = {
args: [
'color: border color',
'side: string indicating on which side border should be, takes either one word or two words joined by dash (i.e. "left" or "bottom-right")',
+ 'width: border width (thickness)',
'[alpha]: (Optional) border opacity, defaults to 1 (fully opaque)',
'[inset]: (Optional) whether border should be on the inside or outside, defaults to inside'
],
diff --git a/static/styles/Redmond DX.iss b/static/styles/Redmond DX.iss
index 7777b7d33..76e325932 100644
--- a/static/styles/Redmond DX.iss
+++ b/static/styles/Redmond DX.iss
@@ -94,7 +94,7 @@ Button:toggled:pressed {
}
Input {
- background: $mod(--bg -80);
+ background: $boost(--bg 20);
shadow: --defaultInputBevel;
roundness: 0
}