diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 00:10:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 00:10:41 +0000 |
| commit | cd6194eb43ddf3df1e96dc836d06dce5f2b7c922 (patch) | |
| tree | 1eb8457373ef4d53ff94499c9665fef64802bea9 /app | |
| parent | 338102393368a6775d6c59306a184f8083acc3f2 (diff) | |
| download | gitlab-ce-cd6194eb43ddf3df1e96dc836d06dce5f2b7c922.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/super_sidebar.scss | 22 | ||||
| -rw-r--r-- | app/services/authorized_project_update/project_recalculate_service.rb | 2 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss index 49eb4c03847..d90c2a5df00 100644 --- a/app/assets/stylesheets/framework/super_sidebar.scss +++ b/app/assets/stylesheets/framework/super_sidebar.scss @@ -1,5 +1,5 @@ @mixin active-toggle { - @include gl-bg-gray-50; + background-color: $gray-50 !important; mix-blend-mode: multiply; .gl-dark & { @@ -61,7 +61,6 @@ @include gl-bg-transparent; @include gl-border-none; - &:hover, &:focus, &:active { @@ -73,11 +72,6 @@ @include gl-focus; } } - - .gl-new-dropdown-toggle[aria-expanded='true'], - .gl-new-dropdown-custom-toggle[aria-expanded='true'] .user-bar-item { - @include active-toggle; - } } .counter .gl-icon { @@ -86,9 +80,7 @@ .counter:hover, .counter:focus, - .gl-new-dropdown-custom-toggle:hover .counter, - .gl-new-dropdown-custom-toggle:focus .counter, - .gl-new-dropdown-custom-toggle[aria-expanded='true'] .counter { + .counter[aria-expanded='true'] { background-color: $gray-50; border-color: transparent; box-shadow: none; @@ -128,15 +120,17 @@ } } + .gl-new-dropdown-toggle[aria-expanded='true'] { + @include active-toggle; + } + .gl-new-dropdown-custom-toggle { .btn-with-notification { mix-blend-mode: unset; // Our tertiary buttons otherwise use another mix-blend mode, making border-color semi-transparent. } - &[aria-expanded='true'] { - .btn-with-notification { - @include active-toggle; - } + [aria-expanded='true'] { + @include active-toggle; } } } diff --git a/app/services/authorized_project_update/project_recalculate_service.rb b/app/services/authorized_project_update/project_recalculate_service.rb index 8d60fffd959..cb83dc57478 100644 --- a/app/services/authorized_project_update/project_recalculate_service.rb +++ b/app/services/authorized_project_update/project_recalculate_service.rb @@ -82,3 +82,5 @@ module AuthorizedProjectUpdate end end end + +AuthorizedProjectUpdate::ProjectRecalculateService.prepend_mod |