From cfba4cc6b3a560d37a063db36dcae507bfd6bf4f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 14 Aug 2024 00:08:56 +0300 Subject: don't do no-auto for themes2 seems to work better --- src/services/theme_data/theme2_to_theme3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/services') diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js index 95eb03c1..f654461d 100644 --- a/src/services/theme_data/theme2_to_theme3.js +++ b/src/services/theme_data/theme2_to_theme3.js @@ -351,6 +351,7 @@ export const convertTheme2To3 = (data) => { newRules.push({ ...rule, parent: { component: 'Notification' } }) } if (key === 'buttonPressed') { + console.log(key) newRules.push({ ...rule, state: ['toggled'] }) newRules.push({ ...rule, state: ['toggled', 'focus'] }) newRules.push({ ...rule, state: ['pressed', 'focus'] }) @@ -418,7 +419,6 @@ export const convertTheme2To3 = (data) => { case 'Border': newRule.parent = rule newRule.directives.textColor = data.colors[key] - newRule.directives.textAuto = 'no-auto' variantArray = parts.slice(0, -1) break default: -- cgit v1.2.3-70-g09d2 From 5384d3b7a2d006d5d760680170b9998bf115862a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Aug 2024 20:43:11 +0300 Subject: fix solid color highlight --- src/services/user_highlighter/user_highlighter.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/services') diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js index b5f58040..145b3e5e 100644 --- a/src/services/user_highlighter/user_highlighter.js +++ b/src/services/user_highlighter/user_highlighter.js @@ -27,7 +27,11 @@ const highlightStyle = (prefs) => { } } else if (type === 'solid') { return { - backgroundColor: tintColor2, + backgroundImage: [ + 'repeating-linear-gradient(90deg,', + `${tintColor} ,`, + `${tintColor} 20px` + ].join(' '), ...customProps } } else if (type === 'side') { -- cgit v1.2.3-70-g09d2 From ab90dc9fb1785d237be5fa3ff207056d7935ddaf Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Aug 2024 21:53:12 +0300 Subject: Revert all the user highlight stuff for now --- src/components/status/status.vue | 5 +++-- src/services/user_highlighter/user_highlighter.js | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/services') diff --git a/src/components/status/status.vue b/src/components/status/status.vue index a8cef3c1..61a58cda 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -3,8 +3,7 @@ v-if="!hideStatus" ref="root" class="Status" - :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]" - :style="[ userStyle ]" + :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]" >
diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js index 145b3e5e..b5f58040 100644 --- a/src/services/user_highlighter/user_highlighter.js +++ b/src/services/user_highlighter/user_highlighter.js @@ -27,11 +27,7 @@ const highlightStyle = (prefs) => { } } else if (type === 'solid') { return { - backgroundImage: [ - 'repeating-linear-gradient(90deg,', - `${tintColor} ,`, - `${tintColor} 20px` - ].join(' '), + backgroundColor: tintColor2, ...customProps } } else if (type === 'side') { -- cgit v1.2.3-70-g09d2 From e7741e619da229726f9a2bde8c3bd6d50c7e5f3b Mon Sep 17 00:00:00 2001 From: HJ <30-hj@users.noreply.git.pleroma.social> Date: Wed, 28 Aug 2024 21:17:37 +0000 Subject: Apply 1 suggestion(s) to 1 file(s) --- src/services/theme_data/theme2_to_theme3.js | 1 - 1 file changed, 1 deletion(-) (limited to 'src/services') diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js index f654461d..bcc0c961 100644 --- a/src/services/theme_data/theme2_to_theme3.js +++ b/src/services/theme_data/theme2_to_theme3.js @@ -351,7 +351,6 @@ export const convertTheme2To3 = (data) => { newRules.push({ ...rule, parent: { component: 'Notification' } }) } if (key === 'buttonPressed') { - console.log(key) newRules.push({ ...rule, state: ['toggled'] }) newRules.push({ ...rule, state: ['toggled', 'focus'] }) newRules.push({ ...rule, state: ['pressed', 'focus'] }) -- cgit v1.2.3-70-g09d2 From 06ebbaf7ba2261d0a1c3c564dcdb5eb5fe32a782 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sun, 4 Aug 2024 15:17:48 -0400 Subject: Simplify the OAuth client_name Every time PleromaFE is used to login it will need to do the OAuth dance and request an app key. If the client name is not stable it will pollute the server's database with entries. This also happens on every unauthenticated page load at the moment until #1339 is resolved --- changelog.d/oauth-app-name.change | 1 + src/services/new_api/oauth.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelog.d/oauth-app-name.change (limited to 'src/services') diff --git a/changelog.d/oauth-app-name.change b/changelog.d/oauth-app-name.change new file mode 100644 index 00000000..15d6f87e --- /dev/null +++ b/changelog.d/oauth-app-name.change @@ -0,0 +1 @@ +Simplify the OAuth client_name to 'PleromaFE' diff --git a/src/services/new_api/oauth.js b/src/services/new_api/oauth.js index 3c8e64bd..a4b7cbf0 100644 --- a/src/services/new_api/oauth.js +++ b/src/services/new_api/oauth.js @@ -10,7 +10,8 @@ export const getOrCreateApp = ({ clientId, clientSecret, instance, commit }) => const url = `${instance}/api/v1/apps` const form = new window.FormData() - form.append('client_name', `PleromaFE_${window.___pleromafe_commit_hash}_${(new Date()).toISOString()}`) + form.append('client_name', 'PleromaFE') + form.append('website', 'https://pleroma.social') form.append('redirect_uris', REDIRECT_URI) form.append('scopes', 'read write follow push admin') -- cgit v1.2.3-70-g09d2