about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-01-27 15:46:50 +0100
committerThibaut Girka <thib@sitedethib.com>2020-01-27 15:46:50 +0100
commitc56a504d116d62fe669d15a270133d7c78dd61f1 (patch)
tree7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /app/javascript/styles
parent8924743349ec5ce37cd949445e071c14968ec2ec (diff)
parentc2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/_mixins.scss3
-rw-r--r--app/javascript/styles/mastodon/about.scss3
-rw-r--r--app/javascript/styles/mastodon/accounts.scss1
-rw-r--r--app/javascript/styles/mastodon/admin.scss10
-rw-r--r--app/javascript/styles/mastodon/components.scss34
-rw-r--r--app/javascript/styles/mastodon/footer.scss1
-rw-r--r--app/javascript/styles/mastodon/forms.scss2
-rw-r--r--app/javascript/styles/mastodon/widgets.scss7
8 files changed, 44 insertions, 17 deletions
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index 4e3e1434a..68cad0fde 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -34,8 +34,9 @@
   box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
 
   h4 {
+    text-transform: uppercase;
     color: $light-text-color;
-    font-size: 14px;
+    font-size: 13px;
     font-weight: 500;
     margin-bottom: 10px;
   }
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 201235187..cf16b54ac 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -719,8 +719,9 @@ $small-breakpoint: 960px;
 
     h4 {
       padding: 10px;
+      text-transform: uppercase;
       font-weight: 700;
-      font-size: 14px;
+      font-size: 13px;
       color: $darker-text-color;
     }
 
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index a1681afe6..5dc067f0e 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -129,6 +129,7 @@
 
   .older,
   .newer {
+    text-transform: uppercase;
     color: $secondary-text-color;
   }
 
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 41654af55..9f7ffe47a 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -232,7 +232,8 @@ $content-width: 840px;
     }
 
     h4 {
-      font-size: 14px;
+      text-transform: uppercase;
+      font-size: 13px;
       font-weight: 700;
       color: $darker-text-color;
       padding-bottom: 8px;
@@ -407,7 +408,8 @@ body,
 
     strong {
       font-weight: 500;
-      font-size: 13px;
+      text-transform: uppercase;
+      font-size: 12px;
 
       @each $lang in $cjk-langs {
         &:lang(#{$lang}) {
@@ -420,7 +422,8 @@ body,
       display: inline-block;
       color: $darker-text-color;
       text-decoration: none;
-      font-size: 13px;
+      text-transform: uppercase;
+      font-size: 12px;
       font-weight: 500;
       border-bottom: 2px solid $ui-base-color;
 
@@ -786,6 +789,7 @@ a.name-tag,
       flex: 0 0 auto;
       font-weight: 500;
       color: $darker-text-color;
+      text-transform: uppercase;
       text-align: right;
 
       a {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cdb932749..ee1908e3e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -41,7 +41,7 @@
   cursor: pointer;
   display: inline-block;
   font-family: inherit;
-  font-size: 15px;
+  font-size: 14px;
   font-weight: 500;
   height: 36px;
   letter-spacing: 0;
@@ -50,6 +50,7 @@
   padding: 0 16px;
   position: relative;
   text-align: center;
+  text-transform: uppercase;
   text-decoration: none;
   text-overflow: ellipsis;
   transition: all 100ms ease-in;
@@ -886,7 +887,7 @@
   }
 
   a {
-    color: $highlight-text-color;
+    color: $secondary-text-color;
     text-decoration: none;
 
     &:hover {
@@ -902,6 +903,10 @@
         }
       }
     }
+
+    &.unhandled-link {
+      color: lighten($ui-highlight-color, 8%);
+    }
   }
 }
 
@@ -932,8 +937,9 @@
   border: 0;
   color: $inverted-text-color;
   font-weight: 700;
-  font-size: 12px;
+  font-size: 11px;
   padding: 0 6px;
+  text-transform: uppercase;
   line-height: 20px;
   cursor: pointer;
   vertical-align: middle;
@@ -1086,6 +1092,7 @@
   .status-check-box__status {
     margin: 10px 0 10px 10px;
     flex: 1;
+    overflow: hidden;
 
     .media-gallery {
       max-width: 250px;
@@ -1455,7 +1462,8 @@ a .account__avatar {
 
   & > span {
     display: block;
-    font-size: 12px;
+    text-transform: uppercase;
+    font-size: 11px;
     color: $darker-text-color;
   }
 
@@ -2803,8 +2811,9 @@ a.account__display-name {
   background: $ui-base-color;
   color: $dark-text-color;
   padding: 8px 20px;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 500;
+  text-transform: uppercase;
   cursor: default;
 }
 
@@ -2869,7 +2878,8 @@ a.account__display-name {
     margin-top: 10px;
 
     h4 {
-      font-size: 13px;
+      font-size: 12px;
+      text-transform: uppercase;
       color: $darker-text-color;
       padding: 10px;
       font-weight: 500;
@@ -3399,8 +3409,9 @@ a.status-card.compact:hover {
 
 .loading-indicator {
   color: $dark-text-color;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 400;
+  text-transform: uppercase;
   overflow: visible;
   position: absolute;
   top: 50%;
@@ -3764,7 +3775,8 @@ a.status-card.compact:hover {
   display: block;
   vertical-align: top;
   background-color: $base-overlay-background;
-  font-size: 12px;
+  text-transform: uppercase;
+  font-size: 11px;
   font-weight: 500;
   padding: 4px;
   border-radius: 4px;
@@ -4016,7 +4028,8 @@ a.status-card.compact:hover {
   }
 
   span {
-    font-size: 13px;
+    font-size: 12px;
+    text-transform: uppercase;
     font-weight: 500;
     display: block;
   }
@@ -4615,7 +4628,8 @@ a.status-card.compact:hover {
     font-weight: 500;
     color: $inverted-text-color;
     margin-bottom: 5px;
-    font-size: 13px;
+    text-transform: uppercase;
+    font-size: 12px;
   }
 
   &__case {
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index f016248ba..00d290883 100644
--- a/app/javascript/styles/mastodon/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
@@ -94,6 +94,7 @@
     }
 
     h4 {
+      text-transform: uppercase;
       font-weight: 700;
       margin-bottom: 8px;
       color: $darker-text-color;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 65cefbd7c..c9ad68f94 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -420,6 +420,7 @@ code {
     line-height: inherit;
     height: auto;
     padding: 10px;
+    text-transform: uppercase;
     text-decoration: none;
     text-align: center;
     box-sizing: border-box;
@@ -662,6 +663,7 @@ code {
 
   a {
     color: $highlight-text-color;
+    text-transform: uppercase;
     text-decoration: none;
     font-weight: 700;
 
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 90e1581bb..ca050a8d9 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -76,8 +76,9 @@
 
   h4 {
     padding: 10px;
+    text-transform: uppercase;
     font-weight: 700;
-    font-size: 14px;
+    font-size: 13px;
     color: $darker-text-color;
   }
 
@@ -138,8 +139,9 @@
 
   h4 {
     padding: 10px;
+    text-transform: uppercase;
     font-weight: 700;
-    font-size: 14px;
+    font-size: 13px;
     color: $darker-text-color;
   }
 
@@ -406,6 +408,7 @@
 
   thead th {
     text-align: center;
+    text-transform: uppercase;
     color: $darker-text-color;
     font-weight: 700;
     padding: 10px;