Merge branch 'master' into glitch-soc/merge-upstream

app/javascript/mastodon/locales/pl.json

@@ -170,7 +170,7 @@
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.favourites": "Ulubione",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Wyciszone słowa",
   "navigation_bar.follow_requests": "Prośby o śledzenie",
   "navigation_bar.info": "Szczegółowe informacje",
   "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe",

app/javascript/styles/application.scss

@@ -21,5 +21,6 @@
 @import 'mastodon/about';
 @import 'mastodon/tables';
 @import 'mastodon/admin';
+@import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';

app/javascript/styles/mastodon/about.scss

@@ -923,7 +923,7 @@ $small-breakpoint: 960px;
     }
 
     @media screen and (max-width: $column-breakpoint) {
-      height: 90vh;
+      display: none;
     }
   }
 

app/javascript/styles/mastodon/dashboard.scss

@@ -0,0 +1,69 @@
+.dashboard__counters {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -5px;
+  margin-bottom: 20px;
+
+  & > div {
+    box-sizing: border-box;
+    flex: 0 0 33.333%;
+    padding: 0 5px;
+    margin-bottom: 10px;
+
+    & > div,
+    & > a {
+      padding: 20px;
+      background: lighten($ui-base-color, 4%);
+      border-radius: 4px;
+    }
+
+    & > a {
+      text-decoration: none;
+      color: inherit;
+      display: block;
+
+      &:hover,
+      &:focus,
+      &:active {
+        background: lighten($ui-base-color, 8%);
+      }
+    }
+  }
+
+  &__num {
+    text-align: center;
+    font-weight: 500;
+    font-size: 24px;
+    color: $primary-text-color;
+    font-family: 'mastodon-font-display', sans-serif;
+    margin-bottom: 20px;
+  }
+
+  &__label {
+    font-size: 14px;
+    color: $darker-text-color;
+    text-align: center;
+    font-weight: 500;
+  }
+}
+
+.dashboard__widgets {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -5px;
+
+  & > div {
+    flex: 0 0 33.333%;
+    margin-bottom: 20px;
+
+    & > div {
+      padding: 0 5px;
+    }
+  }
+
+  a:not(.name-tag) {
+    color: $ui-secondary-color;
+    font-weight: 500;
+    text-decoration: none;
+  }
+}

app/javascript/styles/mastodon/stream_entries.scss

@@ -2,6 +2,10 @@
   clear: both;
   box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 
+  div[data-component] {
+    width: 100%;
+  }
+
   .entry {
     background: $simple-background-color;