Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 files changed, 0 insertions, 4 deletions

diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 55ebd3091..92c02e847 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -258,7 +258,6 @@ h5 {
     padding: 16px;
     line-height: 20px;
     mso-line-height-rule: exactly;
-    border-radius: 4px;
     text-align: center;
     font-weight: 500;
     font-size: 17px;
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 281f5b2bf..9f2a1a3af 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -322,7 +322,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/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c1dd63bc3..2ca844076 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3611,7 +3611,6 @@ a.status-card.compact:hover {
   span {
     display: block;
     float: left;
-    margin-left: 50%;
     transform: translateX(-50%);
     margin: 82px 0 0 50%;
     white-space: nowrap;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 5ee4d104b..f76ff18b3 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -593,7 +593,6 @@ $fluid-breakpoint: $maximum-width + 20px;
     display: block;
     font-weight: 500;
     padding: 15px;
-    overflow: hidden;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;