) : spoilerButton}
@@ -229,9 +200,9 @@ export default class Card extends PureComponent {
}
return (
-
+
);
} else if (card.get('image')) {
@@ -250,7 +221,7 @@ export default class Card extends PureComponent {
}
return (
-
+
{embed}
{description}
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 30366b938f..f2decf9b53 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3486,15 +3486,16 @@ input.glitch-setting-text {
}
.status-card {
- position: relative;
display: flex;
+ align-items: center;
+ position: relative;
font-size: 14px;
- border: 1px solid lighten($ui-base-color, 8%);
- border-radius: 4px;
- color: $dark-text-color;
+ color: $darker-text-color;
margin-top: 14px;
text-decoration: none;
overflow: hidden;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-radius: 8px;
&__actions {
bottom: 0;
@@ -3505,11 +3506,13 @@ input.glitch-setting-text {
display: flex;
justify-content: center;
align-items: center;
+ cursor: pointer;
& > div {
background: rgba($base-shadow-color, 0.6);
border-radius: 8px;
padding: 12px 9px;
+ backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
flex: 0 0 auto;
display: flex;
justify-content: center;
@@ -3539,19 +3542,37 @@ input.glitch-setting-text {
position: relative;
bottom: -1px;
}
-
- a .fa,
- a:hover .fa {
- color: inherit;
- }
}
}
a.status-card {
cursor: pointer;
- &:hover {
- background: lighten($ui-base-color, 8%);
+ &:hover,
+ &:focus,
+ &:active {
+ .status-card__title,
+ .status-card__host,
+ .status-card__author,
+ .status-card__description {
+ color: $highlight-text-color;
+ }
+ }
+}
+
+.status-card a {
+ color: inherit;
+ text-decoration: none;
+
+ &:hover,
+ &:focus,
+ &:active {
+ .status-card__title,
+ .status-card__host,
+ .status-card__author,
+ .status-card__description {
+ color: $highlight-text-color;
+ }
}
}
@@ -3577,41 +3598,66 @@ a.status-card {
.status-card__title {
display: block;
- font-weight: 500;
- margin-bottom: 5px;
- color: $darker-text-color;
+ font-weight: 700;
+ font-size: 19px;
+ line-height: 24px;
+ color: $primary-text-color;
overflow: hidden;
- text-overflow: ellipsis;
white-space: nowrap;
- text-decoration: none;
+ text-overflow: ellipsis;
+}
+
+.status-card.expanded .status-card__title {
+ white-space: normal;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
}
.status-card__content {
flex: 1 1 auto;
overflow: hidden;
- padding: 14px;
- padding-inline-start: 8px;
-}
-
-.status-card__description {
- color: $darker-text-color;
- overflow: hidden;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
+ padding: 8px 10px; // intentional glitch-soc change to reduce padding
+ box-sizing: border-box;
+ max-width: 100%;
}
.status-card__host {
display: block;
- margin-top: 5px;
- font-size: 13px;
+ font-size: 14px;
+ margin-bottom: 8px;
+ white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+}
+
+.status-card__author {
+ display: block;
+ margin-top: 8px;
+ font-size: 14px;
+ color: $primary-text-color;
white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+ strong {
+ font-weight: 500;
+ }
+}
+
+.status-card__description {
+ display: block;
+ margin-top: 8px;
+ font-size: 14px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.status-card__image {
- flex: 0 0 100px;
+ flex: 0 0 auto;
+ width: 96px; // intentional glitch-soc change to better use space
+ aspect-ratio: 1;
background: lighten($ui-base-color, 8%);
position: relative;
@@ -3626,50 +3672,7 @@ a.status-card {
}
}
-.status-card.horizontal {
- display: block;
-
- .status-card__image {
- width: 100%;
- }
-
- .status-card__image-image,
- .status-card__image-preview {
- border-radius: 4px 4px 0 0;
- }
-
- .status-card__title {
- white-space: inherit;
- }
-}
-
-.status-card.compact {
- border-color: lighten($ui-base-color, 4%);
-
- &.interactive {
- border: 0;
- }
-
- .status-card__content {
- padding: 8px;
- padding-top: 10px;
- }
-
- .status-card__title {
- white-space: nowrap;
- }
-
- .status-card__image {
- flex: 0 0 60px;
- }
-}
-
-a.status-card.compact:hover {
- background-color: lighten($ui-base-color, 4%);
-}
-
.status-card__image-image {
- border-radius: 4px 0 0 4px;
display: block;
margin: 0;
width: 100%;
@@ -3680,7 +3683,6 @@ a.status-card.compact:hover {
}
.status-card__image-preview {
- border-radius: 4px 0 0 4px;
display: block;
margin: 0;
width: 100%;
@@ -3697,6 +3699,37 @@ a.status-card.compact:hover {
}
}
+.status-card.expanded {
+ flex-direction: column;
+ align-items: flex-start;
+}
+
+.status-card.expanded .status-card__image {
+ width: 100%;
+ aspect-ratio: auto;
+}
+
+.status-card__image,
+.status-card__image-image,
+.status-card__image-preview {
+ border-start-start-radius: 8px;
+ border-start-end-radius: 0;
+ border-end-end-radius: 0;
+ border-end-start-radius: 8px;
+}
+
+.status-card.expanded .status-card__image,
+.status-card.expanded .status-card__image-image,
+.status-card.expanded .status-card__image-preview {
+ border-start-end-radius: 8px;
+ border-end-end-radius: 0;
+ border-end-start-radius: 0;
+}
+
+.status-card.expanded > a {
+ width: 100%;
+}
+
.notification,
.status {
position: relative;