From 6211eff739ab13c583499db9506bde7038d585b0 Mon Sep 17 00:00:00 2001 From: koyu Date: Fri, 6 Mar 2020 05:31:51 +0100 Subject: [Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI Port e69a3f54a10e58d32d7e46c494d98be948dde4b3 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/components/media.scss | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/components/media.scss b/app/javascript/flavours/glitch/styles/components/media.scss index 39bfaae9a..3cb076191 100644 --- a/app/javascript/flavours/glitch/styles/components/media.scss +++ b/app/javascript/flavours/glitch/styles/components/media.scss @@ -62,12 +62,6 @@ } .media-gallery__gifv { - &.autoplay { - .media-gallery__gifv__label { - display: none; - } - } - &:hover { .media-gallery__gifv__label { opacity: 1; -- cgit From 3c96a0c21da6b2d3b31bd832f3be95189fccb4bd Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 6 Mar 2020 15:20:14 +0100 Subject: [Glitch] Fix too large announcements not being scrollable in web UI Port 503eab1c1f101e92f163ed4f8457cac9a6193ffc to glitch-soc Signed-off-by: Thibaut Girka --- .../flavours/glitch/styles/components/announcements.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/components/announcements.scss b/app/javascript/flavours/glitch/styles/components/announcements.scss index eab6c728b..52feefd3c 100644 --- a/app/javascript/flavours/glitch/styles/components/announcements.scss +++ b/app/javascript/flavours/glitch/styles/components/announcements.scss @@ -1,5 +1,6 @@ .announcements__item__content { word-wrap: break-word; + overflow-y: auto; .emojione { width: 20px; @@ -69,17 +70,21 @@ box-sizing: border-box; width: 100%; padding: 15px; - padding-right: 15px + 18px; position: relative; font-size: 15px; line-height: 20px; word-wrap: break-word; font-weight: 400; + max-height: 50vh; + overflow: hidden; + display: flex; + flex-direction: column; &__range { display: block; font-weight: 500; margin-bottom: 10px; + padding-right: 18px; } &__unread { -- cgit From bdb06f50ec51ecfde2775cc894b7f659e5f696cc Mon Sep 17 00:00:00 2001 From: "Mélanie Chauvel (ariasuni)" Date: Sun, 8 Mar 2020 15:36:50 +0100 Subject: [Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI Port 2e18b1a2a2976f04f84e92d187b0620223a64fa6 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/components/composer.scss | 4 ++-- app/javascript/flavours/glitch/styles/components/emoji.scss | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index 943776010..460f75c1f 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -3,8 +3,8 @@ .emoji-picker-dropdown { position: absolute; - right: 5px; - top: 5px; + top: 0; + right: 0; ::-webkit-scrollbar-track:hover, ::-webkit-scrollbar-track:active { diff --git a/app/javascript/flavours/glitch/styles/components/emoji.scss b/app/javascript/flavours/glitch/styles/components/emoji.scss index 160e9d811..9dfee346a 100644 --- a/app/javascript/flavours/glitch/styles/components/emoji.scss +++ b/app/javascript/flavours/glitch/styles/components/emoji.scss @@ -72,10 +72,7 @@ .emoji-button { display: block; - font-size: 24px; - line-height: 24px; - margin-left: 2px; - width: 24px; + padding: 5px 5px 2px 2px; outline: 0; cursor: pointer; @@ -91,7 +88,6 @@ margin: 0; width: 22px; height: 22px; - margin-top: 2px; } &:hover, -- cgit