diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/assets/stylesheets/pages/issuable.scss | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/assets/stylesheets/pages/issuable.scss')
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 69797c6b303..85205f4d5ac 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -297,7 +297,7 @@ padding: 0; .issuable-context-form { - --initial-top: calc(#{$header-height} + #{$mr-tabs-height}); + --initial-top: calc(#{$header-height} + 76px); --top: var(--initial-top); @include gl-sticky; @@ -613,7 +613,7 @@ } .participants-author { - &:nth-of-type(7n) { + &:nth-of-type(8n) { padding-right: 0; } @@ -962,40 +962,26 @@ border-left: 2px solid $gray-50; position: absolute; left: 39px; - height: 80%; + height: calc(100% + #{$gl-spacing-scale-5}); + top: -#{$gl-spacing-scale-5}; } - &:first-child::before, - &:last-child::after { + &:first-child::before { content: none; } &:first-child { &::after { - top: 50%; + top: $gl-spacing-scale-5; + height: calc(100% + #{$gl-spacing-scale-5}); } } - &:last-child { + &:last-child, + &.create-timeline-event { &::before { - bottom: 50%; - } - } - - &:not(:first-child):not(:last-child) { - &::before { - top: -10%; - } - - &::after { - bottom: -10%; - } - } - - &.timeline-event-note-form { - &::before { - top: -15% !important; // Override default positioning - height: 20%; + top: - #{$gl-spacing-scale-5} !important; // Override default positioning + @include gl-h-8; } &::after { @@ -1007,3 +993,22 @@ .timeline-event-note-form { padding-left: 20px; } + +.timeline-entry:not(:last-child) { + .timeline-event-border { + @include gl-pb-5; + @include gl-border-gray-50; + @include gl-border-1; + @include gl-border-b-solid; + } +} + +.timeline-group:last-child { + .timeline-entry:last-child, + .create-timeline-event { + .timeline-event-bottom-border { + @include gl-border-b; + @include gl-pt-5; + } + } +} |