Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 0 deletions

diff --git a/app/assets/stylesheets/components/shortcuts_help.scss b/app/assets/stylesheets/components/shortcuts_help.scss
new file mode 100644
index 00000000000..ea2281538b4
--- /dev/null
+++ b/app/assets/stylesheets/components/shortcuts_help.scss
@@ -0,0 +1,29 @@
+.shortcut-help {
+  &-body {
+    height: 80vh;
+    overflow-y: scroll;
+  }
+
+  &-container {
+    column-count: 1;
+    @include media-breakpoint-up(md) {
+      column-count: 2;
+    }
+    column-gap: 1rem;
+  }
+
+  &-mapping {
+    overflow: hidden;
+    break-inside: avoid;
+
+    &-title {
+      margin-left: 40%;
+    }
+
+    kbd {
+      margin: 0.1rem 0;
+      line-height: unset;
+      font-size: unset;
+    }
+  }
+}