Merge remote-tracking branch 'tootsuite/master'

2017-11-27 22:33:26 -06:00
parent 8bad6bdd00 706e534455
commit 7463d80ff4
11 changed files with 195 additions and 1 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2099,6 +2099,27 @@
  }
 }

+.keyboard-shortcuts {
+  padding: 8px 0 0;
+  overflow: hidden;
+
+  thead {
+    position: absolute;
+    left: -9999px;
+  }
+
+  td {
+    padding: 0 10px 8px;
+  }
+
+  code {
+    display: inline-block;
+    padding: 3px 5px;
+    background-color: lighten($ui-base-color, 8%);
+    border: 1px solid darken($ui-base-color, 4%);
+  }
+}
+
 .setting-text {
  color: $ui-primary-color;
  background: transparent;