Merge branch 'misc-style-fixes-or-changes' into shigusegubu-themes3

src/App.scss

@@ -21,7 +21,7 @@
 }
 
 html {
-  font-size: var(--textSize, 14px);
+  font-size: var(--textSize, 1rem);
 
   --navbar-height: var(--navbarSize, 3.5rem);
   --emoji-size: var(--emojiSize, 32px);
@@ -382,6 +382,10 @@ nav {
   font-family: sans-serif;
   font-family: var(--font);
 
+  &.-transparent {
+    backdrop-filter: blur(0.125em) contrast(60%);
+  }
+
   &::-moz-focus-inner {
     border: none;
   }

src/components/button.style.js

@@ -64,6 +64,26 @@ export default {
         opacity: 0.5
       }
     },
+    {
+      component: 'Text',
+      parent: {
+        component: 'Button',
+        variant: 'transparent'
+      },
+      directives: {
+        textColor: '--text'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'Button',
+        variant: 'transparent'
+      },
+      directives: {
+        textColor: '--text'
+      }
+    },
     {
       state: ['hover'],
       directives: {

src/components/emoji_picker/emoji_picker.js

@@ -140,7 +140,7 @@ const EmojiPicker = {
     },
     updateEmojiSize () {
       const css = window.getComputedStyle(this.$refs.popover.$el)
-      const fontSize = css.getPropertyValue('font-size') || '14px'
+      const fontSize = css.getPropertyValue('font-size') || '1rem'
       const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem'
 
       const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '').trim()

src/components/notification/notification.vue

@@ -12,13 +12,13 @@
   <article
     class="NotificationParent"
     :class="{ '-expandable': expandable }"
-    :aria-controls="'notif-' +notification.id"
     v-else
   >
     <div
       v-if="needMute && !unmuted"
       :id="'notif-' +notification.id"
       :aria-expanded="statusExpanded"
+      :aria-controls="'notif-' +notification.id"
       class="Notification container -muted"
     >
       <small>

src/components/status/status.scss

@@ -245,8 +245,8 @@
     margin-right: 0;
 
     .emoji {
-      width: 14px;
+      width: 1em;
-      height: 14px;
+      height: 1em;
       vertical-align: middle;
       object-fit: contain;
     }

src/components/status_body/status_body.vue

@@ -59,32 +59,6 @@
             @click.prevent="toggleShowMore"
           >
             {{ toggleText }}
-            <template v-if="!showingMore">
-              <FAIcon
-                v-if="attachmentTypes.includes('image')"
-                icon="image"
-              />
-              <FAIcon
-                v-if="attachmentTypes.includes('video')"
-                icon="video"
-              />
-              <FAIcon
-                v-if="attachmentTypes.includes('audio')"
-                icon="music"
-              />
-              <FAIcon
-                v-if="attachmentTypes.includes('unknown')"
-                icon="file"
-              />
-              <FAIcon
-                v-if="status.poll && status.poll.options"
-                icon="poll-h"
-              />
-              <FAIcon
-                v-if="status.card"
-                icon="link"
-              />
-            </template>
           </button>
         </div>
       </div>

src/components/status_content/status_content.vue

@@ -24,7 +24,7 @@
         />
       </div>
 
-      <div v-else-if="status.poll && status.poll.options && compact">
+      <div class="poll-icon" v-else-if="status.poll && status.poll.options && compact">
         <FAIcon
           icon="poll-h"
           size="2x"
@@ -63,5 +63,9 @@
 .StatusContent {
   flex: 1;
   min-width: 0;
+
+  .poll-icon {
+    margin: 0.5em;
+  }
 }
 </style>

src/modules/instance.js

@@ -108,7 +108,7 @@ const defaultState = {
   palette: null,
   style: null,
   emojiReactionsScale: 0.5,
-  textSize: '14px',
+  textSize: '1rem',
   emojiSize: '2.2rem',
   navbarSize: '3.5rem',
   panelHeaderSize: '3.2rem',