diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/stylesheets/framework/diffs.scss | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/stylesheets/framework/diffs.scss')
-rw-r--r-- | app/assets/stylesheets/framework/diffs.scss | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index 61a20c7a8fd..568182ad796 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -613,7 +613,7 @@ table.code { grid-template-columns: 1fr 1fr; } - &.inline { + &.inline-diff-view { .diff-grid-comments { display: grid; grid-template-columns: 1fr; @@ -682,26 +682,6 @@ table.code { max-height: 50vh; } -.diff-stats-summary-toggler { - padding: 0; - background-color: transparent; - border: 0; - color: $blue-600; - font-weight: $gl-font-weight-bold; - - &:hover, - &:focus { - outline: none; - color: $blue-800; - } - - .caret-icon { - position: relative; - top: 2px; - left: -1px; - } -} - // Mobile @media (max-width: 480px) { .diff-title { @@ -853,21 +833,14 @@ table.code { .diff-files-changed { .inline-parallel-buttons { - position: relative; + @include gl-relative; z-index: 1; } - .commit-stat-summary { - @include media-breakpoint-up(sm) { - background-color: $white; - } - } - @include media-breakpoint-up(sm) { - position: -webkit-sticky; - position: sticky; + @include gl-sticky; top: $header-height + $mr-tabs-height; - background-color: $white; + @include gl-bg-white; z-index: 200; .with-performance-bar & { @@ -875,14 +848,13 @@ table.code { } &.is-stuck { - padding-top: 0; - padding-bottom: 0; + @include gl-py-0; border-top: 1px solid $white-dark; border-bottom: 1px solid $white-dark; .diff-stats-additions-deletions-expanded, .inline-parallel-buttons { - display: none !important; + @include gl-display-none; } } } @@ -890,12 +862,13 @@ table.code { @include media-breakpoint-up(lg) { &.is-stuck { .diff-stats-additions-deletions-collapsed { - display: block !important; + @include gl-display-block; } } } } + .diff-file-changes { max-width: 560px; width: 100%; |