Skip to content

Commit

Permalink
Merge pull request #14515 from craftcms/feature/darker-sidebar
Browse files Browse the repository at this point in the history
Slightly-darker global sidebar
  • Loading branch information
brandonkelly authored Mar 2, 2024
2 parents 7410d7a + 9b7da01 commit 8881dcb
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- The global sidebar background color is now a shade darker than the rest of the page. ([#14515](https://github.com/craftcms/cms/pull/14515))
- Fixed a bug where `craft\helpers\Html::parseTagAttribute()` wasn’t handling attribute values with newlines. ([#14498](https://github.com/craftcms/cms/issues/14498))

## 5.0.0-beta.5 - 2024-03-01
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/web/assets/cp/src/css/_color-palette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

--gray-050-hsl: 212, 60%, 97%;
--gray-100-hsl: 212, 50%, 93%;
--gray-150-hsl: 212, 40%, 89%;
--gray-200-hsl: 212, 30%, 85%;
--gray-300-hsl: 211, 13%, 65%;
--gray-350-hsl: 211, 11%, 59%;
Expand All @@ -21,6 +22,7 @@

--gray-050: hsl(var(--gray-050-hsl));
--gray-100: hsl(var(--gray-100-hsl));
--gray-150: hsl(var(--gray-150-hsl));
--gray-200: hsl(var(--gray-200-hsl));
--gray-300: hsl(var(--gray-300-hsl));
--gray-350: hsl(var(--gray-350-hsl));
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/src/css/_cp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ $systemInfoHoverBgColor: darken($grey800, 10%);
#trial-info {
padding: 16px var(--xl);
border-radius: var(--large-border-radius);
background-color: hsl(212, 40%, 90%);
background-color: var(--gray-150);
box-shadow:
inset 0 1px 0 rgba(255, 255, 255, 0.5),
0 0 0 1px hsl(212, 30%, 80%),
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/src/css/_global-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
height: 100vh;
padding: 0;
-webkit-overflow-scrolling: touch;
background-color: transparent;
background-color: var(--gray-150);
border-right: 1px solid var(--hairline-color);
width: var(--global-sidebar-width);

Expand Down

0 comments on commit 8881dcb

Please sign in to comment.