Add latest changes from gitlab-org/gitlab@master

6 files changed, 36 insertions, 9 deletions

diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue
index 45a6130826d..c99133fd251 100644
--- a/app/assets/javascripts/profile/account/components/update_username.vue
+++ b/app/assets/javascripts/profile/account/components/update_username.vue
@@ -60,7 +60,7 @@ Please update your Git repository remotes as soon as possible.`),
       return {
         text: __('Update username'),
         attributes: [
-          { variant: 'warning' },
+          { variant: 'confirm' },
           { category: 'primary' },
           { disabled: this.isRequestPending },
         ],
@@ -127,8 +127,7 @@ Please update your Git repository remotes as soon as possible.`),
       v-gl-modal-directive="$options.modalId"
       :disabled="newUsername === username"
       :loading="isRequestPending"
-      category="primary"
-      variant="warning"
+      variant="confirm"
       data-testid="username-change-confirmation-modal"
       >{{ $options.buttonText }}</gl-button
     >
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index fd20dfa3539..bba995a6de3 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -110,6 +110,7 @@ label {
   }
 
   &:focus {
+    border-color: $gray-400;
     @include gl-focus;
   }
 }
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 9b38e842635..086b83b13e0 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -49,7 +49,7 @@
   }
 
   img.avatar {
-    margin-right: $gl-padding;
+    margin-right: $gl-padding-12;
 
     @include media-breakpoint-down(sm) {
       width: $gl-spacing-scale-6;
diff --git a/app/assets/stylesheets/page_bundles/issues_show.scss b/app/assets/stylesheets/page_bundles/issues_show.scss
index 63b0bcc0c7f..ade649faaae 100644
--- a/app/assets/stylesheets/page_bundles/issues_show.scss
+++ b/app/assets/stylesheets/page_bundles/issues_show.scss
@@ -22,9 +22,10 @@
       inset-inline-start: 1rem;
     }
 
-    /* The inside bullet aligns itself to the bottom, which we see when text to its right wraps.
-     * We fix this by aligning it to the top. Targeting ::marker doesn't seem to work. */
-    > * {
+    /* The inside bullet aligns itself to the bottom, which we see when text to the right of
+     * a multi-line list item wraps. We fix this by aligning it to the top, and excluding
+     * other elements adversely affected by this. Targeting ::marker doesn't seem to work. */
+    > *:not(code):not(input):not(.gl-label) {
       vertical-align: top;
     }
 
@@ -38,7 +39,23 @@
 
     /* We fix the other paragraphs not indenting to the
      * right of the bullet due to the inside bullet. */
-    > :not(p:first-of-type):not(.drag-icon):not(.task-list-item-checkbox):not(.gfm-issue):not(.js-add-task) {
+    p ~ a,
+    p ~ blockquote,
+    p ~ code,
+    p ~ details,
+    p ~ dl,
+    p ~ h1,
+    p ~ h2,
+    p ~ h3,
+    p ~ h4,
+    p ~ h5,
+    p ~ h6,
+    p ~ hr,
+    p ~ ol,
+    p ~ p,
+    p ~ table:not(.code), /* We need :not(.code) to override typography.scss */
+    p ~ ul,
+    p ~ .markdown-code-block {
       margin-inline-start: 1rem;
     }
   }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 4736d441a4b..645f145328b 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -77,6 +77,10 @@
   }
 }
 
+.md-area:focus-within {
+  @include gl-focus;
+}
+
 .md-header .nav-links {
   display: flex;
   flex-flow: row wrap;
@@ -427,7 +431,11 @@ table {
 }
 
 .comment-warning-wrapper {
+  transition: border-color ease-in-out 0.15s,
+    box-shadow ease-in-out 0.15s;
+
   .md-area {
     border: 0;
+    box-shadow: none;
   }
 }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 18a878214e7..34da1cdc86b 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -199,6 +199,7 @@ $system-note-svg-size: 16px;
     }
 
     .note-body {
+      padding: $gl-padding-4;
       overflow-x: auto;
       overflow-y: hidden;
 
@@ -615,6 +616,7 @@ $system-note-svg-size: 16px;
 
 .note-header-info {
   min-width: 0;
+  padding-left: $gl-padding-4;
 
   &.discussion {
     padding-bottom: 0;
@@ -623,7 +625,7 @@ $system-note-svg-size: 16px;
 
 .note-header-info,
 .note-actions {
-  padding-bottom: $gl-padding-8;
+  padding-bottom: $gl-padding-4;
 }
 
 .system-note .note-header-info {