Merge branch 'themes3' into shigusegubu-themes3

src/components/chat_list_item/chat_list_item.scss

@@ -9,10 +9,6 @@
     outline: none;
   }
 
-  &:hover {
-    box-shadow: var(--shadow);
-  }
-
   .chat-list-item-left {
     margin-right: 1em;
   }

src/components/conversation/conversation.vue

@@ -206,6 +206,7 @@
   </div>
   <div
     v-else
+    class="Conversation -hidden"
     :style="hiddenStyle"
   />
 </template>
@@ -216,6 +217,11 @@
 .Conversation {
   z-index: 1;
 
+  &.-hidden {
+    background: var(--__panel-background);
+    backdrop-filter: var(--__panel-backdrop-filter);
+  }
+
   .conversation-dive-to-top-level-box {
     padding: var(--status-margin);
     border-bottom: 1px solid var(--border);

src/components/poll/poll.js

@@ -38,7 +38,7 @@ export default {
       return (this.poll && this.poll.options) || []
     },
     expiresAt () {
-      return (this.poll && this.poll.expires_at) || 0
+      return (this.poll && this.poll.expires_at) || null
     },
     expired () {
       return (this.poll && this.poll.expired) || false

src/components/poll/poll.vue

@@ -78,13 +78,16 @@
       </button>
       <div class="total">
         <template v-if="typeof poll.voters_count === 'number'">
-          {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
+          {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}
         </template>
         <template v-else>
-          {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
+          {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}
         </template>
+        <span v-if="expiresAt !== null">
+          &nbsp;·&nbsp;
+        </span>
       </div>
-      <span>
+      <span v-if="expiresAt !== null">
         <i18n-t
           scope="global"
           :keypath="expired ? 'polls.expired' : 'polls.expires_in'"

src/components/search/search.vue

@@ -154,11 +154,6 @@
   text-align: center;
 }
 
-.Search .tab-switcher .tabs {
-  background: var(--__panel-background);
-  backdrop-filter: var(--__panel-backdrop-filter);
-}
-
 @media all and (max-width: 800px) {
   .search-nav-heading {
     .tab-switcher .tabs .tab-wrapper {

src/components/status/status.scss

@@ -347,6 +347,7 @@
     position: relative;
     display: flex;
     align-items: center;
+    overflow: hidden;
 
     &::before {
       content: "";

src/components/timeline/timeline.scss

@@ -1,6 +1,7 @@
 .Timeline {
   .timeline-body {
     background: none;
+    backdrop-filter: none;
   }
 
   .alert-badge {

src/components/user_profile/user_profile.vue

@@ -168,11 +168,6 @@
   // No sticky header on user profile
   --currentPanelStack: 1;
 
-  .tab-switcher .tabs {
-    background: var(--__panel-background);
-    backdrop-filter: var(--__panel-backdrop-filter);
-  }
-
   .user-birthday {
     margin: 0 0.75em 0.5em;
   }