diff --git a/src/App.scss b/src/App.scss index 38574cab..36176b35 100644 --- a/src/App.scss +++ b/src/App.scss @@ -469,7 +469,7 @@ textarea, color: $fallback--lightText; color: var(--inputText, $fallback--lightText); font-family: sans-serif; - font-family: var(--inputFont, sans-serif); + font-family: var(--interfaceFont, sans-serif); font-size: 1em; margin: 0; box-sizing: border-box; diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index c2a3e801..bd6284b3 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -114,7 +114,7 @@ svg { width: 22px; margin-right: 0.75rem; - color: var(--menuPopoverIcon, $fallback--icon) + color: var(--popoverIcon, $fallback--icon) } } diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 02468f17..f4680336 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -291,12 +291,14 @@ > {{ $t('post_status.post') }} - + + + + -

({ + key: mode, + value: mode, + label: this.$t(`settings.user_accepts_direct_messages_from_${mode}`) + })) } }, components: { + ChoiceSetting, ScopeSelector, ImageCropper, EmojiInput, @@ -126,7 +134,8 @@ const ProfileTab = { fields_attributes: this.newFields.filter(el => el != null), bot: this.bot, show_role: this.showRole, - status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1 + status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1, + accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom /* eslint-enable camelcase */ } diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index 8748b685..9f80582f 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -89,6 +89,15 @@ {{ $t('settings.bot') }}

+

+ + {{ $t('settings.user_accepts_direct_messages_from') }} + +

{{ $t('settings.expire_posts_enabled') }} @@ -102,6 +111,9 @@ class="expire-posts-days" :placeholder="$t('settings.expire_posts_input_placeholder')" /> +

+

+

{{ $t("nav.home_timeline") }} -

  • - - - {{ $t("nav.bubble_timeline") }} - -
  • {{ $t("nav.public_tl") }}
  • +
  • + + + {{ $t("nav.bubble_timeline") }} + +
  • { output.friends_count = data.following_count output.bot = data.bot + output.accepts_direct_messages_from = data.accepts_direct_messages_from output.follow_requests_count = data.follow_requests_count if (data.akkoma) { output.instance = data.akkoma.instance diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 9e691261..8954a9ce 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -7,14 +7,18 @@ export const applyTheme = (input) => { const body = document.body body.classList.add('hidden') - const styleEl = document.getElementById('theme-holder') - const styleSheet = styleEl.sheet + /** @type {CSSStyleSheet} */ + const styleSheet = document.getElementById('theme-holder').sheet + + for (let i = styleSheet.cssRules.length; i--; ) { + styleSheet.deleteRule(0) + } + + styleSheet.insertRule( + `:root { ${rules.radii}; ${rules.colors}; ${rules.shadows}; ${rules.fonts}; }`, + 0 + ) - styleSheet.toString() - styleSheet.insertRule(`:root { ${rules.radii} }`, 'index-max') - styleSheet.insertRule(`:root { ${rules.colors} }`, 'index-max') - styleSheet.insertRule(`:root { ${rules.shadows} }`, 'index-max') - styleSheet.insertRule(`:root { ${rules.fonts} }`, 'index-max') body.classList.remove('hidden') } diff --git a/static/themes/paper.json b/static/themes/paper.json index a3b90a0a..fa697a7a 100644 --- a/static/themes/paper.json +++ b/static/themes/paper.json @@ -70,31 +70,21 @@ "buttonHover": [ { "x": 0, - "y": "2", - "blur": "5", - "spread": 0, + "y": 2, + "blur": 3, + "spread": -2, "color": "#494949", - "alpha": "0.1" - }, - { - "x": 0, - "y": "2", - "blur": "0", - "spread": "20", - "color": "#ffffff", - "alpha": "1", - "inset": true + "alpha": "0.5" } ], "buttonPressed": [ { "x": 0, - "y": 0, - "blur": "4", - "spread": "0", + "y": 2, + "blur": 3, + "spread": -3, "color": "#494949", - "alpha": "0.8", - "inset": false + "alpha": "0.5" } ], "avatarStatus": [ @@ -138,14 +128,18 @@ ] }, "opacity": { - "underlay": "1", + "underlay": 0, "border": "0" }, "colors": { "bg": "#ffffff", "fg": "#f6f6f6", - "text": "#494949", - "underlay": "#ffffff", + "text": "#222222", + "underlay": "#f1f2f3", + "wallpaper": "#f1f2f3", + "selectedMenu": "#f1f2f3", + "selectedMenuPopover": "#f1f2f3", + "selectedPost": "#f1f2f3", "link": "#788ca1", "accent": "#97a0aa", "cBlue": "#788ca1", @@ -156,6 +150,7 @@ "border": "#ffffff", "icon": "#b6c9c4", "panel": "#ffffff", + "topBar": "#ffffff", "topBarText": "#4b4b4b" }, "radii": {