diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-22 15:16:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-22 15:16:21 +0200 |
commit | 2024aef0f9b52297d814811f5825678a563f78ff (patch) | |
tree | 5014b9fa72ae4704d61ae7ffc8e992f0b67b6a25 /app/javascript/flavours/glitch/styles | |
parent | 03952c7d4980a008f6711d7f14b8808229d73524 (diff) | |
parent | 8027d921ab174b35bcf08bf96b69676a4515435f (diff) |
Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/about.scss | 1 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/index.scss | 1 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/widgets.scss | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss index cdf2d116b..2cc43afec 100644 --- a/app/javascript/flavours/glitch/styles/about.scss +++ b/app/javascript/flavours/glitch/styles/about.scss @@ -324,7 +324,6 @@ $small-breakpoint: 960px; font-family: $font-sans-serif, sans-serif; font-size: 16px; font-weight: 400; - font-size: 16px; line-height: 30px; margin-bottom: 12px; color: $darker-text-color; diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 16045d5ee..24f750e1d 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -1232,7 +1232,6 @@ button.icon-button.active i.fa-retweet { span { display: block; float: left; - margin-left: 50%; transform: translateX(-50%); margin: 82px 0 0 50%; white-space: nowrap; diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss index b397844a2..05bc076ea 100644 --- a/app/javascript/flavours/glitch/styles/widgets.scss +++ b/app/javascript/flavours/glitch/styles/widgets.scss @@ -584,7 +584,6 @@ $fluid-breakpoint: $maximum-width + 20px; display: block; font-weight: 500; padding: 15px; - overflow: hidden; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; |