Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solidus legacy color hierarchy #5446

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Solidus legacy color hierarchy #5446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d96336
Update colors for Solidus Legacy
mfrecchiami Oct 20, 2023
24b97b7
Icon alignment on sidebar menu
mfrecchiami Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/app/assets/stylesheets/spree/backend/components/_hint.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.hint-tooltip {
cursor: pointer;

i {
color: $color-dark-light;
}
}
6 changes: 4 additions & 2 deletions backend/app/assets/stylesheets/spree/backend/components/_navigation_solidus_admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,16 @@ $color-navbar-hover: $color-navbar !default;
padding: 2px 12px;
width: 100%;
border-radius: $border-radius;
color: $color-primary;
color: $solidus-admin-gray-800;
gap: 12px;
display: flex;
align-items: center;

&::before,
svg {
display: inline-block;
display: inline-flex;
align-items: center;
justify-content: center;
width: 18px;
height: 18px;
padding: 0;
Expand Down
5 changes: 5 additions & 0 deletions backend/app/assets/stylesheets/spree/backend/shared/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ table {
text-align: center;
border-bottom: none;
vertical-align: middle;
color: $color-dark-light;

&:before {
padding: 0;
Expand Down Expand Up @@ -111,6 +112,10 @@ table {

th a {
color: $color-dark;

&:hover {
color: $color-dark-light;
}
}

tbody {
Expand Down
23 changes: 17 additions & 6 deletions backend/app/assets/stylesheets/spree/backend/themes/solidus_admin/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ $color-dark-dark: $solidus-admin-gray-600;
$color-dark-light: $solidus-admin-gray-500;
$color-dark-accent: $solidus-admin-gray-200;

$color-primary: $solidus-admin-black;
$color-primary: $solidus-admin-gray-700;
$color-primary-light: $solidus-admin-gray-100;

$color-light: $solidus-admin-gray-15;
$color-light: $solidus-admin-gray-25;
$color-light-dark: $solidus-admin-gray-50;
$color-light-accent: $solidus-admin-gray-100;

Expand All @@ -49,10 +49,10 @@ $color-navbar-active: $solidus-admin-solidus-red;
$color-navbar-active-bg: $solidus-admin-gray-50;
$color-navbar-submenu: $color-dark-light;
$color-navbar-submenu-bg: $color-light;
$color-navbar-submenu-active: $color-primary;
$color-navbar-submenu-active: $solidus-admin-solidus-red;
$color-navbar-footer: $color-dark;
$color-navbar-footer-bg: $color-light;
$color-navbar-footer-active: $color-primary;
$color-navbar-footer-active: $solidus-admin-solidus-red;
$color-icon-navbar: $color-dark-light;

$color-navbar-hover-bg: $solidus-admin-gray-50;
Expand All @@ -61,7 +61,7 @@ $color-navbar-hover: $color-dark;
// Basic Tabs colors
$color-tab: $color-dark-light;
$color-tab-bg: $color-light;
$color-tab-border: $color-border;
$color-tab-border: $color-light-accent;
$color-tab-active: $color-primary;
$color-tab-active-bg: $color-white;
$color-tab-active-border: $color-white;
Expand All @@ -74,6 +74,7 @@ $color-error: $color-red;
// Breadcrumb custom variable

$breadcrumb-color: $color-dark-light;
$breadcrumb-active-color: $color-dark;

// Color for spinner
$color-spinner: $color-white;
Expand Down Expand Up @@ -157,4 +158,14 @@ $main-header-height: 84px;
$content-wrapper-bg: $color-white;
$admin-body-bg: $color-white;

$link-hover-color: $solidus-admin-solidus-red;
// Links
//--------------------------------------------------------------

$link-color: $solidus-admin-blue;
$link-hover-color: darken($solidus-admin-blue, 10%);

// Pagination
//--------------------------------------------------------------

$pagination-color: $color-primary;
$pagination-hover-color: $color-dark;