aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/chat_list_item/chat_list_item.scss2
-rw-r--r--src/components/conversation/conversation.vue33
-rw-r--r--src/components/notifications/notifications.scss15
-rw-r--r--src/components/poll/poll.vue2
-rw-r--r--src/components/status/status.scss400
-rw-r--r--src/components/status/status.vue491
-rw-r--r--src/components/status_content/status_content.vue13
-rw-r--r--src/components/status_popover/status_popover.vue3
-rw-r--r--src/components/still-image/still-image.vue47
-rw-r--r--src/components/timeline/timeline.vue2
-rw-r--r--src/components/user_reporting_modal/user_reporting_modal.vue3
11 files changed, 488 insertions, 523 deletions
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 617054ec..10ba45f2 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -77,7 +77,7 @@
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
}
- .status-body {
+ .StatusContent {
img.emoji {
width: 1.4em;
height: 1.4em;
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 2e48240a..997a4d10 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,7 +1,7 @@
<template>
<div
- class="timeline panel-default"
- :class="[isExpanded ? 'panel' : 'panel-disabled']"
+ class="Conversation"
+ :class="{ '-expanded' : isExpanded, 'panel' : isExpanded }"
>
<div
v-if="isExpanded"
@@ -28,7 +28,7 @@
:replies="getReplies(status.id)"
:in-profile="inProfile"
:profile-user-id="profileUserId"
- class="status-fadein panel-body"
+ class="conversation-status status-fadein panel-body"
@goto="setHighlight"
@toggleExpanded="toggleExpanded"
/>
@@ -40,14 +40,27 @@
<style lang="scss">
@import '../../_variables.scss';
-.timeline {
- .panel-disabled {
- .status-el {
- border-left: none;
- border-bottom-width: 1px;
- border-bottom-style: solid;
+.Conversation {
+ .conversation-status {
+ border-left: none;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: var(--border, $fallback--border);
+ border-radius: 0;
+ }
+
+ &.-expanded {
+ .conversation-status {
+ border-color: $fallback--border;
border-color: var(--border, $fallback--border);
- border-radius: 0;
+ border-left: 4px solid $fallback--cRed;
+ border-left: 4px solid var(--cRed, $fallback--cRed);
+ }
+
+ .conversation-status:last-child {
+ border-bottom: none;
+ border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+ border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
}
}
}
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index b1a3ad70..1bd91995 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -60,16 +60,8 @@
height: 32px;
}
- .status-body {
- color: $fallback--faint;
- color: var(--faint, $fallback--faint);
- a {
- color: var(--faintLink);
- }
- .status-content a {
- color: var(--postFaintLink);
- }
- }
+ --link: var(--faintLink);
+ --text: var(--faint);
}
.follow-request-accept {
@@ -106,7 +98,8 @@
}
}
- .status-el {
+ /* TODO cleanup this */
+ .Status {
flex: 1;
}
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index adbb0555..ceba9eea 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
<span class="result-percentage">
{{ percentageForOption(option.votes_count) }}%
</span>
- <span v-html="option.title_html"></span>
+ <span v-html="option.title_html" />
</div>
<div
class="result-fill"
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
new file mode 100644
index 00000000..898e914f
--- /dev/null
+++ b/src/components/status/status.scss
@@ -0,0 +1,400 @@
+
+@import '../../_variables.scss';
+
+$status-margin: 0.75em;
+
+.Status {
+ min-width: 0;
+
+ &:hover .avatar {
+ --still-image-img: visible;
+ --still-image-canvas: hidden;
+ }
+
+ &.-focused {
+ background-color: $fallback--lightBg;
+ background-color: var(--selectedPost, $fallback--lightBg);
+ color: $fallback--text;
+ color: var(--selectedPostText, $fallback--text);
+
+ --lightText: var(--selectedPostLightText, $fallback--light);
+ --faint: var(--selectedPostFaintText, $fallback--faint);
+ --faintLink: var(--selectedPostFaintLink, $fallback--faint);
+ --postLink: var(--selectedPostPostLink, $fallback--faint);
+ --postFaintLink: var(--selectedPostFaintPostLink, $fallback--faint);
+ --icon: var(--selectedPostIcon, $fallback--icon);
+ }
+
+ .status-container {
+ display: flex;
+ padding: $status-margin;
+
+ &.-repeat {
+ padding-top: 0;
+ }
+ }
+
+ .pin {
+ padding: $status-margin $status-margin 0;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ }
+
+ .left-side {
+ margin-right: $status-margin;
+ }
+
+ .right-side {
+ flex: 1;
+ min-width: 0;
+ }
+
+ .usercard {
+ margin-bottom: $status-margin;
+ }
+
+ .status-username {
+ white-space: nowrap;
+ font-size: 14px;
+ overflow: hidden;
+ max-width: 85%;
+ font-weight: bold;
+ flex-shrink: 1;
+ margin-right: 0.4em;
+ text-overflow: ellipsis;
+
+ .emoji {
+ width: 14px;
+ height: 14px;
+ vertical-align: middle;
+ object-fit: contain;
+ }
+ }
+
+ .status-favicon {
+ height: 18px;
+ width: 18px;
+ margin-right: 0.4em;
+ }
+
+ .status-heading {
+ margin-bottom: 0.5em;
+ }
+
+ .heading-name-row {
+ display: flex;
+ justify-content: space-between;
+ line-height: 18px;
+
+ a {
+ display: inline-block;
+ word-break: break-all;
+ }
+ }
+
+ .account-name {
+ min-width: 1.6em;
+ margin-right: 0.4em;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex: 1 1 0;
+ }
+
+ .heading-left {
+ display: flex;
+ min-width: 0;
+ }
+
+ .heading-right {
+ display: flex;
+ flex-shrink: 0;
+ }
+
+ .timeago {
+ margin-right: 0.2em;
+ }
+
+ .heading-reply-row {
+ position: relative;
+ align-content: baseline;
+ font-size: 12px;
+ line-height: 18px;
+ max-width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: stretch;
+ }
+
+ .reply-to-and-accountname {
+ display: flex;
+ height: 18px;
+ margin-right: 0.5em;
+ max-width: 100%;
+
+ .icon-reply {
+ // mirror the icon
+ transform: scaleX(-1);
+ }
+ }
+
+ & .reply-to-popover,
+ & .reply-to-no-popover {
+ min-width: 0;
+ margin-right: 0.4em;
+ }
+
+ .reply-to-popover {
+ &:hover {
+ border-bottom: 1px solid var(--faint);
+ }
+
+ .faint-link:hover {
+ // override default
+ text-decoration: none;
+ }
+
+ &.-strikethrough {
+ position: relative;
+
+ &::after {
+ content: '';
+ display: block;
+ position: absolute;
+ top: 50%;
+ width: 100%;
+ border-bottom: 1px solid var(--faint);
+ }
+ }
+ }
+
+ .reply-to {
+ display: flex;
+ }
+
+ .reply-to-text {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-left: 0.2em;
+ }
+
+ .replies-separator {
+ margin-left: 0.4em;
+ }
+
+ .replies {
+ line-height: 18px;
+ font-size: 12px;
+ display: flex;
+ flex-wrap: wrap;
+
+ & > * {
+ margin-right: 0.4em;
+ }
+ }
+
+ .reply-link {
+ height: 17px;
+ }
+
+ .repeat-info {
+ padding: 0.4em $status-margin;
+ line-height: 22px;
+
+ .right-side {
+ display: flex;
+ align-content: center;
+ flex-wrap: wrap;
+ }
+
+ i {
+ padding: 0 0.2em;
+ }
+ }
+
+ .repeater-avatar {
+ border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+ margin-left: 28px;
+ width: 20px;
+ height: 20px;
+ }
+
+ .repeater-name {
+ text-overflow: ellipsis;
+ margin-right: 0;
+
+ .emoji {
+ width: 14px;
+ height: 14px;
+ vertical-align: middle;
+ object-fit: contain;
+ }
+ }
+
+ .status-fadein {
+ animation-duration: 0.4s;
+ animation-name: fadein;
+ }
+
+ @keyframes fadein {
+ from {
+ opacity: 0;
+ }
+
+ to {
+ opacity: 1;
+ }
+ }
+
+ .status-actions {
+ position: relative;
+ width: 100%;
+ display: flex;
+ margin-top: $status-margin;
+
+ > * {
+ max-width: 4em;
+ flex: 1;
+ }
+ }
+
+ .button-reply {
+ &:not(.-disabled) {
+ cursor: pointer;
+ }
+
+ &:not(.-disabled):hover,
+ &.-active {
+ color: $fallback--cBlue;
+ color: var(--cBlue, $fallback--cBlue);
+ }
+ }
+
+ .muted {
+ padding: 0.25em 0.6em;
+ height: 1.2em;
+ line-height: 1.2em;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ display: flex;
+ flex-wrap: nowrap;
+
+ & .status-username,
+ & .mute-thread,
+ & .mute-words {
+ word-wrap: normal;
+ word-break: normal;
+ white-space: nowrap;
+ }
+
+ & .status-username,
+ & .mute-words {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
+ .status-username {
+ font-weight: normal;
+ flex: 0 1 auto;
+ margin-right: 0.2em;
+ font-size: smaller;
+ }
+
+ .mute-thread {
+ flex: 0 0 auto;
+ }
+
+ .mute-words {
+ flex: 1 0 5em;
+ margin-left: 0.2em;
+
+ &::before {
+ content: ' ';
+ }
+ }
+
+ .unmute {
+ flex: 0 0 auto;
+ margin-left: auto;
+ display: block;
+ }
+ }
+
+ .reply-form {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+
+ .reply-body {
+ flex: 1;
+ }
+
+ .favs-repeated-users {
+ margin-top: $status-margin;
+ }
+
+ .stats {
+ width: 100%;
+ display: flex;
+ line-height: 1em;
+ }
+
+ .avatar-row {
+ flex: 1;
+ overflow: hidden;
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ &::before {
+ content: '';
+ position: absolute;
+ height: 100%;
+ width: 1px;
+ left: 0;
+ background-color: var(--faint, $fallback--faint);
+ }
+ }
+
+ .stat-count {
+ margin-right: $status-margin;
+ user-select: none;
+
+ .stat-title {
+ color: var(--faint, $fallback--faint);
+ font-size: 12px;
+ text-transform: uppercase;
+ position: relative;
+ }
+
+ .stat-number {
+ font-weight: bolder;
+ font-size: 16px;
+ line-height: 1em;
+ }
+
+ &:hover .stat-title {
+ text-decoration: underline;
+ }
+ }
+
+ @media all and (max-width: 800px) {
+ .repeater-avatar {
+ margin-left: 20px;
+ }
+
+ .avatar:not(.repeater-avatar) {
+ width: 40px;
+ height: 40px;
+
+ // TODO define those other way somehow?
+ // stylelint-disable rscss/class-format
+ &.avatar-compact {
+ width: 32px;
+ height: 32px;
+ }
+ }
+ }
+}
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e1e56ec9..27af4340 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -2,8 +2,8 @@
<!-- eslint-disable vue/no-v-html -->
<div
v-if="!hideStatus"
- class="status-el"
- :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"
+ class="Status"
+ :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
>
<div
v-if="error"
@@ -16,8 +16,8 @@
/>
</div>
<template v-if="muted && !isPreview">
- <div class="media status container muted">
- <small class="username">
+ <div class="status-csontainer muted">
+ <small class="status-username">
<i
v-if="muted && retweet"
class="button-icon icon-retweet"
@@ -54,7 +54,7 @@
<template v-else>
<div
v-if="showPinned"
- class="status-pin"
+ class="pin"
>
<i class="fa icon-pin faint" />
<span class="faint">{{ $t('status.pinned') }}</span>
@@ -63,17 +63,17 @@
v-if="retweet && !noHeading && !inConversation"
:class="[repeaterClass, { highlighted: repeaterStyle }]"
:style="[repeaterStyle]"
- class="media container retweet-info"
+ class="status-container repeat-info"
>
<UserAvatar
v-if="retweet"
- class="media-left"
+ class="left-side repeater-avatar"
:better-shadow="betterShadow"
:user="statusoid.user"
/>
- <div class="media-body faint">
+ <div class="right-side faint">
<span
- class="user-name"
+ class="status-username repeater-name"
:title="retweeter"
>
<router-link
@@ -95,14 +95,14 @@
</div>
<div
- :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet && !inConversation }]"
+ :class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
:style="[ userStyle ]"
- class="media status"
+ class="status-container"
:data-tags="tags"
>
<div
v-if="!noHeading"
- class="media-left"
+ class="left-side"
>
<router-link
:to="userProfileLink"
@@ -115,29 +115,29 @@
/>
</router-link>
</div>
- <div class="status-body">
+ <div class="right-side">
<UserCard
v-if="userExpanded"
:user-id="status.user.id"
:rounded="true"
:bordered="true"
- class="status-usercard"
+ class="usercard"
/>
<div
v-if="!noHeading"
- class="media-heading"
+ class="status-heading"
>
<div class="heading-name-row">
- <div class="name-and-account-name">
+ <div class="heading-left">
<h4
v-if="status.user.name_html"
- class="user-name"
+ class="status-username"
:title="status.user.name"
v-html="status.user.name_html"
/>
<h4
v-else
- class="user-name"
+ class="status-username"
:title="status.user.name"
>
{{ status.user.name }}
@@ -150,8 +150,8 @@
{{ status.user.screen_name }}
</router-link>
<img
- class="status-favicon"
v-if="!!(status.user && status.user.favicon)"
+ class="status-favicon"
:src="status.user.favicon"
>
</div>
@@ -211,6 +211,7 @@
:status-id="status.parent_visible && status.in_reply_to_status_id"
class="reply-to-popover"
style="min-width: 0"
+ :class="{ '-strikethrough': !status.parent_visible }"
>
<a
class="reply-to"
@@ -218,10 +219,9 @@
:aria-label="$t('tool_tip.reply')"
@click.prevent="gotoOriginal(status.in_reply_to_status_id)"
>
- <i class="button-icon icon-reply" />
+ <i class="button-icon reply-button icon-reply" />
<span
class="faint-link reply-to-text"
- :class="{ 'strikethrough': !status.parent_visible }"
>
{{ $t('status.reply_to') }}
</span>
@@ -229,7 +229,7 @@
</StatusPopover>
<span
v-else
- class="reply-to"
+ class="reply-to-no-popover"
>
<span class="reply-to-text">{{ $t('status.reply_to') }}</span>
</span>
@@ -317,19 +317,19 @@
<div
v-if="!noHeading && !isPreview"
- class="status-actions media-body"
+ class="status-actions"
>
<div>
<i
v-if="loggedIn"
- class="button-icon icon-reply"
+ class="button-icon button-reply icon-reply"
:title="$t('tool_tip.reply')"
- :class="{'button-icon-active': replying}"
+ :class="{'-active': replying}"
@click.prevent="toggleReplying"
/>
<i
v-else
- class="button-icon button-icon-disabled icon-reply"
+ class="button-icon button-reply -disabled icon-reply"
:title="$t('tool_tip.reply')"
/>
<span v-if="status.replies_count > 0">{{ status.replies_count }}</span>
@@ -357,7 +357,7 @@
</div>
<div
v-if="replying"
- class="container"
+ class="status-container reply-form"
>
<PostStatusForm
class="reply-body"
@@ -375,439 +375,4 @@
</template>
<script src="./status.js" ></script>
-<style lang="scss">
-@import '../../_variables.scss';
-
-$status-margin: 0.75em;
-
-.status-body {
- flex: 1;
- min-width: 0;
-}
-
-.status-pin {
- padding: $status-margin $status-margin 0;
- display: flex;
- align-items: center;
- justify-content: flex-end;
-}
-
-.media-left {
- margin-right: $status-margin;
-}
-
-.status-el {
- border-left-width: 0px;
- min-width: 0;
- border-color: $fallback--border;
- border-color: var(--border, $fallback--border);
-
- border-left: 4px $fallback--cRed;
- border-left: 4px var(--cRed, $fallback--cRed);
-
- &_focused {
- background-color: $fallback--lightBg;
- background-color: var(--selectedPost, $fallback--lightBg);
- color: $fallback--text;
- color: var(--selectedPostText, $fallback--text);
- --lightText: var(--selectedPostLightText, $fallback--light);
- --faint: var(--selectedPostFaintText, $fallback--faint);
- --faintLink: var(--selectedPostFaintLink, $fallback--faint);
- --postLink: var(--selectedPostPostLink, $fallback--faint);
- --postFaintLink: var(--selectedPostFaintPostLink, $fallback--faint);
- --icon: var(--selectedPostIcon, $fallback--icon);
- }
-
- .timeline & {
- border-bottom-width: 1px;
- border-bottom-style: solid;
- }
-
- .media-body {
- flex: 1;
- padding: 0;
- }
-
- .status-usercard {
- margin-bottom: $status-margin;
- }
-
- .user-name {
- white-space: nowrap;
- font-size: 14px;
- overflow: hidden;
- flex-shrink: 0;
- max-width: 85%;
- font-weight: bold;
-
- img.emoji {
- width: 14px;
- height: 14px;
- vertical-align: middle;
- object-fit: contain
- }
- }
-
- .status-favicon {
- height: 18px;
- width: 18px;
- margin-right: 0.4em;
- }
-
- .media-heading {
- padding: 0;
- vertical-align: bottom;
- flex-basis: 100%;
- margin-bottom: 0.5em;
-
- small {
- font-weight: lighter;
- }
-
- .heading-name-row {
- padding: 0;
- display: flex;
- justify-content: space-between;
- line-height: 18px;
-
- a {
- display: inline-block;
- word-break: break-all;
- }
-
- .name-and-account-name {
- display: flex;
- min-width: 0;
- }
-
- .user-name {
- flex-shrink: 1;
- margin-right: 0.4em;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
- .account-name {
- min-width: 1.6em;
- margin-right: 0.4em;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- flex: 1 1 0;
- }
- }
-
- .heading-right {
- display: flex;
- flex-shrink: 0;
- }
-
- .timeago {
- margin-right: 0.2em;
- }
-
- .heading-reply-row {
- position: relative;
- align-content: baseline;
- font-size: 12px;
- line-height: 18px;
- max-width: 100%;
- display: flex;
- flex-wrap: wrap;
- align-items: stretch;
-
- > .reply-to-and-accountname > a {
- overflow: hidden;
- max-width: 100%;
- text-overflow: ellipsis;
- white-space: nowrap;
- word-break: break-all;
- }
- }
-
- .reply-to-and-accountname {
- display: flex;
- height: 18px;
- margin-right: 0.5em;
- max-width: 100%;
- .icon-reply {
- transform: scaleX(-1);
- }
- }
-
- .reply-info {
- display: flex;
- }
-
- .reply-to-popover {
- min-width: 0;
- }
-
- .reply-to {
- display: flex;
- }
-
- .reply-to-text {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- margin: 0 0.4em 0 0.2em;
- }
-
- .strikethrough {
- text-decoration: line-through;
- }
-
- .replies-separator {
- margin-left: 0.4em;
- }
-
- .replies {
- line-height: 18px;
- font-size: 12px;
- display: flex;
- flex-wrap: wrap;
- & > * {
- margin-right: 0.4em;
- }
- }
-
- .reply-link {
- height: 17px;
- }
- }
-
- .retweet-info {
- padding: 0.4em $status-margin;
- margin: 0;
-
- .avatar.still-image {
- border-radius: $fallback--avatarAltRadius;
- border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
- margin-left: 28px;
- width: 20px;
- height: 20px;
- }
-
- .media-body {
- font-size: 1em;
- line-height: 22px;
-
- display: flex;
- align-content: center;
- flex-wrap: wrap;
-
- .user-name {
- font-weight: bold;
- overflow: hidden;
- text-overflow: ellipsis;
-
- img {
- width: 14px;
- height: 14px;
- vertical-align: middle;
- object-fit: contain
- }
- }
-
- i {
- padding: 0 0.2em;
- }
-
- a {
- max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- }
- }
-}
-
-.status-fadein {
- animation-duration: 0.4s;
- animation-name: fadein;
-}
-
-@keyframes fadein {
- from {
- opacity: 0;
- }
- to {
- opacity: 1;
- }
-}
-
-.status-conversation {
- border-left-style: solid;
-}
-
-.status-actions {
- position: relative;
- width: 100%;
- display: flex;
- margin-top: $status-margin;
-
- > * {
- max-width: 4em;
- flex: 1;
- }
-}
-
-.button-icon.icon-reply {
- &:not(.button-icon-disabled):hover,
- &.button-icon-active {
- color: $fallback--cBlue;
- color: var(--cBlue, $fallback--cBlue);
- }
-}
-
-.button-icon.icon-reply {
- &:not(.button-icon-disabled) {
- cursor: pointer;
- }
-}
-
-.status:hover .animated.avatar {
- canvas {
- display: none;
- }
- img {
- visibility: visible;
- }
-}
-
-.status {
- display: flex;
- padding: $status-margin;
- &.is-retweet {
- padding-top: 0;
- }
-}
-
-.status-conversation:last-child {
- border-bottom: none;
-}
-
-.muted {
- padding: .25em .6em;
- height: 1.2em;
- line-height: 1.2em;
- text-overflow: ellipsis;
- overflow: hidden;
- display: flex;
- flex-wrap: nowrap;
-
- .username, .mute-thread, .mute-words {
- word-wrap: normal;
- word-break: normal;
- white-space: nowrap;
- }
-
- .username, .mute-words {
- text-overflow: ellipsis;
- overflow: hidden;
- }
-
- .username {
- flex: 0 1 auto;
- margin-right: .2em;
- }
-
- .mute-thread {
- flex: 0 0 auto;
- }
-
- .mute-words {
- flex: 1 0 5em;
- margin-left: .2em;
- &::before {
- content: ' '
- }
- }
-
- .unmute {
- flex: 0 0 auto;
- margin-left: auto;
- display: block;
- margin-left: auto;
- }
-}
-
-.reply-body {
- flex: 1;
-}
-
-.favs-repeated-users {
- margin-top: $status-margin;
-
- .stats {
- width: 100%;
- display: flex;
- line-height: 1em;
-
- .stat-count {
- margin-right: $status-margin;
- user-select: none;
-
- &:hover .stat-title {
- text-decoration: underline;
- }
-
- .stat-title {
- color: var(--faint, $fallback--faint);
- font-size: 12px;
- text-transform: uppercase;
- position: relative;
- }
-
- .stat-number {
- font-weight: bolder;
- font-size: 16px;
- line-height: 1em;
- }
- }
-
- .avatar-row {
- flex: 1;
- overflow: hidden;
- position: relative;
- display: flex;
- align-items: center;
-
- &::before {
- content: '';
- position: absolute;
- height: 100%;
- width: 1px;
- left: 0;
- background-color: var(--faint, $fallback--faint);
- }
- }
- }
-}
-
-@media all and (max-width: 800px) {
- .status-el {
- .retweet-info {
- .avatar.still-image {
- margin-left: 20px;
- }
- }
- }
- .status {
- max-width: 100%;
- }
-
- .status .avatar.still-image {
- width: 40px;
- height: 40px;
-
- &.avatar-compact {
- width: 32px;
- height: 32px;
- }
- }
-}
-
-</style>
+<style src="./status.scss" lang="scss"></style>
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index ab48786c..fb469a2f 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -1,6 +1,6 @@
<template>
<!-- eslint-disable vue/no-v-html -->
- <div class="status-body">
+ <div class="StatusContent">
<slot name="header" />
<div
v-if="status.summary_html"
@@ -133,7 +133,7 @@
$status-margin: 0.75em;
-.status-body {
+.StatusContent {
flex: 1;
min-width: 0;
@@ -284,13 +284,4 @@ $status-margin: 0.75em;
color: $fallback--cGreen;
color: var(--postGreentext, $fallback--cGreen);
}
-
-.timeline :not(.panel-disabled) > {
- .status-el:last-child {
- border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
- border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
- border-bottom: none;
- }
-}
-
</style>
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 2a8503e8..79a52e38 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -52,7 +52,8 @@
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
box-shadow: var(--popupShadow);
- .status-el.status-el {
+ /* TODO cleanup this */
+ .Status.Status {
border: none;
}
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 2ebf33ba..6fa055de 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -35,8 +35,16 @@
display: flex;
align-items: center;
- &:hover canvas {
- display: none;
+ canvas {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+ visibility: var(--still-image-canvas, visible);
}
img {
@@ -46,15 +54,6 @@
}
&.animated {
- &:hover::before,
- img {
- visibility: hidden;
- }
-
- &:hover img {
- visibility: visible
- }
-
&::before {
content: 'gif';
position: absolute;
@@ -62,25 +61,27 @@
font-size: 10px;
top: 5px;
left: 5px;
- background: rgba(127,127,127,.5);
- color: #FFF;
+ background: rgba(127, 127, 127, 0.5);
+ color: #fff;
display: block;
padding: 2px 4px;
border-radius: $fallback--tooltipRadius;
border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
z-index: 2;
}
- }
- canvas {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- width: 100%;
- height: 100%;
- object-fit: contain;
+ &:hover canvas {
+ display: none;
+ }
+
+ &:hover::before,
+ img {
+ visibility: var(--still-image-img, hidden);
+ }
+
+ &:hover img {
+ visibility: visible;
+ }
}
}
</style>
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 9eed10f6..2ff933e9 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,5 +1,5 @@
<template>
- <div :class="classes.root">
+ <div :class="[classes.root, 'timeline']">
<div :class="classes.header">
<TimelineMenu v-if="!embedded" />
<div
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 6ee53461..2a8d8d48 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -146,7 +146,8 @@
display: flex;
justify-content: space-between;
- > .status-el {
+ /* TODO cleanup this */
+ > .Status {
flex: 1;
}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 15:07:17 +0000