diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
commit | 6c3124c854cbeef391a38b5ae8330174d78348bf (patch) | |
tree | af77629bc34ccc517ed24d9db35895be5d02d23d /app/assets/stylesheets | |
parent | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/source_editor.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/issues_show.scss | 41 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 8 |
3 files changed, 50 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/source_editor.scss b/app/assets/stylesheets/framework/source_editor.scss index 8b694b9be05..046b8636f65 100644 --- a/app/assets/stylesheets/framework/source_editor.scss +++ b/app/assets/stylesheets/framework/source_editor.scss @@ -83,6 +83,11 @@ } } } + + // Remove custom focus from element + .inputarea { + @include gl-shadow-none; + } } .active-line-text { diff --git a/app/assets/stylesheets/page_bundles/issues_show.scss b/app/assets/stylesheets/page_bundles/issues_show.scss index 9873a0121c0..ade649faaae 100644 --- a/app/assets/stylesheets/page_bundles/issues_show.scss +++ b/app/assets/stylesheets/page_bundles/issues_show.scss @@ -3,8 +3,8 @@ .description { ul, ol { - /* We're changing list-style-position to inside because the default of outside - * doesn't move the negative margin to the left of the bullet. */ + /* We're changing list-style-position to inside because the default of + * outside doesn't move negative margin to the left of the bullet. */ list-style-position: inside; } @@ -21,6 +21,43 @@ inset-block-start: 0.3rem; inset-inline-start: 1rem; } + + /* 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; + } + + /* The inside bullet is treated like an element inside the li element, so when we have a + * multi-paragraph list item, the text doesn't start on the right of the bullet because + * it is a block level p element. We make it inline to fix this. */ + > p:first-of-type { + display: inline-block; + max-width: calc(100% - 1.5rem); + } + + /* We fix the other paragraphs not indenting to the + * right of the bullet due to the inside bullet. */ + 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; + } } ul.task-list { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 4093ef087dc..086abcf3f86 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -769,8 +769,12 @@ .add-issuable-form-input-wrapper { &.focus { - border-color: $blue-300; - box-shadow: 0 0 4px $dropdown-input-focus-shadow; + border-color: $gray-700; + @include gl-focus; + + input { + @include gl-shadow-none; + } } .gl-show-field-errors &.form-control:not(textarea) { |