diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-09 15:07:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-09 15:07:31 +0300 |
commit | 1935f3e81b99c00697bf0b4d6a44d64068b34745 (patch) | |
tree | e2c42218945d0ae19c4566e844d4707513cc2fd6 /app/assets/stylesheets | |
parent | a352bc8e72b948a834b0569d0d4288e95a9c529e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/todos.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/startup/startup-dark.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/_dark.scss | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index ec8ffaf8c53..539e92eeca4 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -392,7 +392,7 @@ $gl-font-size-large: 16px; $gl-font-weight-normal: 400; $gl-font-weight-bold: 600; $gl-text-color: $gray-900; -$gl-text-color-secondary: $gray-500; +$gl-text-color-secondary: $gray-500 !default; $gl-text-color-tertiary: $gray-400; $gl-text-color-quaternary: #d6d6d6; $gl-text-color-inverted: $white; diff --git a/app/assets/stylesheets/page_bundles/todos.scss b/app/assets/stylesheets/page_bundles/todos.scss index b35f5b38740..d4b0b4169d3 100644 --- a/app/assets/stylesheets/page_bundles/todos.scss +++ b/app/assets/stylesheets/page_bundles/todos.scss @@ -79,11 +79,11 @@ @include gl-py-0; @include gl-px-1; @include gl-m-0; - @include gl-bg-gray-50; @include gl-border-0; @include gl-rounded-base; @include gl-display-inline-flex; - @include gl-text-body; + background: var(--gray-50, $gray-50); + color: var(--gl-text-color, $gl-text-color); } .gl-label-scoped { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 5abd3e89cac..ee91d955019 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -495,7 +495,7 @@ .protected-branches-list, .protected-tags-list { - margin-bottom: 30px; + margin-bottom: 32px; .settings-message { margin: 0; diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index ef39a4c31e8..efc2b2ebfb3 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -591,7 +591,7 @@ svg { } .toggle-sidebar-button .collapse-text, .toggle-sidebar-button .icon-chevron-double-lg-left { - color: #89888d; + color: #bfbfc3; } html { overflow-y: scroll; @@ -1424,7 +1424,7 @@ kbd { padding: 0 16px; background-color: #24232a; border: 0; - color: #89888d; + color: #bfbfc3; display: flex; align-items: center; background-color: #1f1e24; diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss index 8db91fd9908..c471d6183d8 100644 --- a/app/assets/stylesheets/themes/_dark.scss +++ b/app/assets/stylesheets/themes/_dark.scss @@ -115,6 +115,8 @@ $data-viz-blue-950: #e9ebff; $border-white-normal: $border-color; +$gl-text-color-secondary: $gray-700; + $body-bg: $gray-10; $input-bg: $white; $input-focus-bg: $white; @@ -130,7 +132,7 @@ $popover-color: $gray-950; $popover-box-shadow: 0 2px 3px 1px $gray-700; $popover-arrow-outer-color: $gray-800; -$secondary: $gray-600; +$secondary: $gray-700; $yiq-text-dark: $gray-50; $yiq-text-light: $gray-950; |