Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

7 files changed, 35 insertions, 58 deletions

diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 14cff5b038a..c177d0b74a2 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -37,10 +37,6 @@
 
   .file-title {
     @include gl-font-monospace;
-    line-height: 35px;
-    padding-top: 7px;
-    padding-bottom: 7px;
-    display: flex;
   }
 
   .editor-ref {
@@ -69,19 +65,15 @@
   }
 
   .file-buttons {
-    display: flex;
     flex: 1;
-    justify-content: flex-end;
   }
 
   .soft-wrap-toggle {
-    display: inline-block;
-    vertical-align: top;
     font-family: $regular-font;
-    margin: 0 $btn-side-margin;
+    margin-left: $gl-padding-8;
 
     .soft-wrap {
-      display: block;
+      display: inline-flex;
     }
 
     .no-wrap {
@@ -94,7 +86,7 @@
       }
 
       .no-wrap {
-        display: block;
+        display: inline-flex;
       }
     }
   }
@@ -111,17 +103,21 @@
     .new-file-path {
       max-width: none;
       width: 100%;
-      margin-bottom: 3px;
+      margin-top: $gl-padding-8;
     }
 
     .file-buttons {
-      display: block;
+      display: flex;
+      flex-direction: column;
       width: 100%;
-      margin-bottom: 10px;
+
+      .md-header-toolbar {
+        margin: $gl-padding 0;
+      }
 
       .soft-wrap-toggle {
         width: 100%;
-        margin: 3px 0;
+        margin-left: 0;
       }
 
       @media(max-width: map-get($grid-breakpoints, md)-1) {
@@ -168,7 +164,6 @@
   .license-selector,
   .gitignore-selector,
   .gitlab-ci-yml-selector,
-  .gitlab-ci-syntax-yml-selector,
   .dockerfile-selector,
   .template-type-selector,
   .metrics-dashboard-selector {
diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index c05216ac6e6..9182292ffd3 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -1,30 +1,30 @@
-.shortcut-mappings {
-  font-size: 12px;
-  color: $gray-700;
-
-  tbody:first-child tr:first-child {
-    padding-top: 0;
+.shortcut-help {
+  &-body {
+    height: 80vh;
+    overflow-y: scroll;
   }
 
-  th {
-    padding-top: 15px;
-    line-height: 1.5;
-    color: $help-shortcut-header-color;
-    text-align: left;
+  &-container {
+    column-count: 1;
+    @include media-breakpoint-up(md) {
+      column-count: 2;
+    }
+    column-gap: 1rem;
   }
 
-  td {
-    padding-top: 3px;
-    padding-bottom: 3px;
-    vertical-align: top;
-    line-height: 20px;
-  }
+  &-mapping {
+    overflow: hidden;
+    break-inside: avoid;
+
+    &-title {
+      margin-left: 40%;
+    }
 
-  .shortcut {
-    padding-right: 10px;
-    color: $gray-300;
-    text-align: right;
-    white-space: nowrap;
+    kbd {
+      margin: 0.1rem 0;
+      line-height: unset;
+      font-size: unset;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index b9f5a427a24..0437fa19752 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -217,7 +217,6 @@
 
   .title {
     color: $gl-text-color;
-    margin-bottom: $gl-padding-4;
     line-height: $gl-line-height-20;
 
     .avatar {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 59768f4cda8..c025d8569a7 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -369,10 +369,6 @@ table {
     .btn {
       float: none;
       width: 100%;
-
-      &:not(:last-child) {
-        margin-bottom: 10px;
-      }
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 801dd44be8e..01739c7eb3e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -372,7 +372,7 @@ $system-note-svg-size: 16px;
       top: $mr-tabs-height + $header-height;
 
       .with-performance-bar & {
-        top: 126px;
+        top: 123px;
       }
     }
 
@@ -672,6 +672,7 @@ $system-note-svg-size: 16px;
   align-items: center;
   margin-left: 10px;
   color: $gray-400;
+  margin-top: -4px;
 
   @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
     float: none;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 16f96ebadc9..dfd64d0773c 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -237,11 +237,6 @@
   line-height: 34px;
   margin: 0;
 
-  > li + li::before {
-    padding: 0 3px;
-    color: $gray-300;
-  }
-
   a {
     color: $gl-text-color;
   }
@@ -1032,11 +1027,6 @@ pre.light-well {
   }
 }
 
-.issuable-footer {
-  padding-top: $gl-padding;
-  padding-bottom: 37px;
-}
-
 .project-ci-linter {
   .ci-editor {
     height: 400px;
diff --git a/app/assets/stylesheets/pages/settings_ci_cd.scss b/app/assets/stylesheets/pages/settings_ci_cd.scss
index 346b3f61caa..7d74070b4f2 100644
--- a/app/assets/stylesheets/pages/settings_ci_cd.scss
+++ b/app/assets/stylesheets/pages/settings_ci_cd.scss
@@ -11,10 +11,6 @@
 
 .trigger-actions {
   white-space: nowrap;
-
-  .btn {
-    margin-left: 10px;
-  }
 }
 
 .auto-devops-card {