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

Jump to bottom

Color Schemes: Add Aquatic and hide Ocean #47273

Merged
merged 1 commit into from
Nov 10, 2020
Merged

Color Schemes: Add Aquatic and hide Ocean #47273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions client/assets/images/color-schemes/color-scheme-thumbnail-aquatic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions client/blocks/color-scheme-picker/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import powderSnowImg from 'calypso/assets/images/color-schemes/color-scheme-thum
import nightfallImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-nightfall.svg';
import sakuraImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-sakura.svg';
import oceanImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-ocean.svg';
import aquaticImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-aquatic.svg';
import sunriseImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-sunrise.svg';
import sunsetImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-sunset.svg';
import midnightImg from 'calypso/assets/images/color-schemes/color-scheme-thumbnail-midnight.svg';
Expand Down Expand Up @@ -75,6 +76,14 @@ export default function ( translate ) {
imageUrl: oceanImg,
},
},
{
label: translate( 'Aquatic' ),
value: 'aquatic',
thumbnail: {
cssClass: 'is-aquatic',
imageUrl: aquaticImg,
},
},
{
label: translate( 'Sunrise' ),
value: 'sunrise',
Expand Down
15 changes: 10 additions & 5 deletions client/blocks/color-scheme-picker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,18 @@ class ColorSchemePicker extends PureComponent {
};

render() {
const colorSchemesData = getColorSchemesData( translate );
const checkedColorScheme = find( colorSchemesData, [
'value',
this.props.colorSchemePreference,
] )
let colorSchemesData = getColorSchemesData( translate );
let checkedColorScheme = find( colorSchemesData, [ 'value', this.props.colorSchemePreference ] )
? this.props.colorSchemePreference
: colorSchemesData[ 0 ].value;
/*
* This temporary code ensures a smooth renaming from Ocean to Aquatic.
* @see https://github.com/Automattic/wp-calypso/issues/47256
*/
if ( checkedColorScheme === 'ocean' ) {
checkedColorScheme = 'aquatic';
}
colorSchemesData = colorSchemesData.filter( ( scheme ) => scheme.value !== 'ocean' );
return (
<div className="color-scheme-picker">
<QueryPreferences />
Expand Down
1 change: 1 addition & 0 deletions client/state/preferences/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const remoteValuesSchema = {
colorScheme: {
type: 'string',
enum: [
'aquatic',
'classic-blue',
'classic-bright',
'contrast',
Expand Down
1 change: 1 addition & 0 deletions packages/calypso-color-schemes/src/calypso-color-schemes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import 'shared/color-schemes/default';

// Color schemes that override default properties
@import 'shared/color-schemes/aquatic';
@import 'shared/color-schemes/classic-blue';
@import 'shared/color-schemes/contrast';
@import 'shared/color-schemes/ectoplasm';
Expand Down
123 changes: 123 additions & 0 deletions packages/calypso-color-schemes/src/shared/color-schemes/_aquatic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
.color-scheme.is-aquatic {
/* Theme Properties */
--color-primary: var( --studio-blue-50 );
--color-primary-rgb: var( --studio-blue-50-rgb );
--color-primary-dark: var( --studio-blue-70 );
--color-primary-dark-rgb: var( --studio-blue-70-rgb );
--color-primary-light: var( --studio-blue-30 );
--color-primary-light-rgb: var( --studio-blue-30-rgb );
--color-primary-0: var( --studio-blue-0 );
--color-primary-0-rgb: var( --studio-blue-0-rgb );
--color-primary-5: var( --studio-blue-5 );
--color-primary-5-rgb: var( --studio-blue-5-rgb );
--color-primary-10: var( --studio-blue-10 );
--color-primary-10-rgb: var( --studio-blue-10-rgb );
--color-primary-20: var( --studio-blue-20 );
--color-primary-20-rgb: var( --studio-blue-20-rgb );
--color-primary-30: var( --studio-blue-30 );
--color-primary-30-rgb: var( --studio-blue-30-rgb );
--color-primary-40: var( --studio-blue-40 );
--color-primary-40-rgb: var( --studio-blue-40-rgb );
--color-primary-50: var( --studio-blue-50 );
--color-primary-50-rgb: var( --studio-blue-50-rgb );
--color-primary-60: var( --studio-blue-60 );
--color-primary-60-rgb: var( --studio-blue-60-rgb );
--color-primary-70: var( --studio-blue-70 );
--color-primary-70-rgb: var( --studio-blue-70-rgb );
--color-primary-80: var( --studio-blue-80 );
--color-primary-80-rgb: var( --studio-blue-80-rgb );
--color-primary-90: var( --studio-blue-90 );
--color-primary-90-rgb: var( --studio-blue-90-rgb );
--color-primary-100: var( --studio-blue-100 );
--color-primary-100-rgb: var( --studio-blue-100-rgb );

--color-accent: var( --studio-celadon-50 );
--color-accent-rgb: var( --studio-celadon-50-rgb );
--color-accent-dark: var( --studio-celadon-70 );
--color-accent-dark-rgb: var( --studio-celadon-70-rgb );
--color-accent-light: var( --studio-celadon-30 );
--color-accent-light-rgb: var( --studio-celadon-30-rgb );
--color-accent-0: var( --studio-celadon-0 );
--color-accent-0-rgb: var( --studio-celadon-0-rgb );
--color-accent-5: var( --studio-celadon-5 );
--color-accent-5-rgb: var( --studio-celadon-5-rgb );
--color-accent-10: var( --studio-celadon-10 );
--color-accent-10-rgb: var( --studio-celadon-10-rgb );
--color-accent-20: var( --studio-celadon-20 );
--color-accent-20-rgb: var( --studio-celadon-20-rgb );
--color-accent-30: var( --studio-celadon-30 );
--color-accent-30-rgb: var( --studio-celadon-30-rgb );
--color-accent-40: var( --studio-celadon-40 );
--color-accent-40-rgb: var( --studio-celadon-40-rgb );
--color-accent-50: var( --studio-celadon-50 );
--color-accent-50-rgb: var( --studio-celadon-50-rgb );
--color-accent-60: var( --studio-celadon-60 );
--color-accent-60-rgb: var( --studio-celadon-60-rgb );
--color-accent-70: var( --studio-celadon-70 );
--color-accent-70-rgb: var( --studio-celadon-70-rgb );
--color-accent-80: var( --studio-celadon-80 );
--color-accent-80-rgb: var( --studio-celadon-80-rgb );
--color-accent-90: var( --studio-celadon-90 );
--color-accent-90-rgb: var( --studio-celadon-90-rgb );
--color-accent-100: var( --studio-celadon-100 );
--color-accent-100-rgb: var( --studio-celadon-100-rgb );

--color-link: var( --studio-celadon-50 );
--color-link-rgb: var( --studio-celadon-50-rgb );
--color-link-dark: var( --studio-celadon-70 );
--color-link-dark-rgb: var( --studio-celadon-70-rgb );
--color-link-light: var( --studio-celadon-30 );
--color-link-light-rgb: var( --studio-celadon-30-rgb );
--color-link-0: var( --studio-celadon-0 );
--color-link-0-rgb: var( --studio-celadon-0-rgb );
--color-link-5: var( --studio-celadon-5 );
--color-link-5-rgb: var( --studio-celadon-5-rgb );
--color-link-10: var( --studio-celadon-10 );
--color-link-10-rgb: var( --studio-celadon-10-rgb );
--color-link-20: var( --studio-celadon-20 );
--color-link-20-rgb: var( --studio-celadon-20-rgb );
--color-link-30: var( --studio-celadon-30 );
--color-link-30-rgb: var( --studio-celadon-30-rgb );
--color-link-40: var( --studio-celadon-40 );
--color-link-40-rgb: var( --studio-celadon-40-rgb );
--color-link-50: var( --studio-celadon-50 );
--color-link-50-rgb: var( --studio-celadon-50-rgb );
--color-link-60: var( --studio-celadon-60 );
--color-link-60-rgb: var( --studio-celadon-60-rgb );
--color-link-70: var( --studio-celadon-70 );
--color-link-70-rgb: var( --studio-celadon-70-rgb );
--color-link-80: var( --studio-celadon-80 );
--color-link-80-rgb: var( --studio-celadon-80-rgb );
--color-link-90: var( --studio-celadon-90 );
--color-link-90-rgb: var( --studio-celadon-90-rgb );
--color-link-100: var( --studio-celadon-100 );
--color-link-100-rgb: var( --studio-celadon-100-rgb );

/* Component Properties */
--color-masterbar-background: var( --studio-blue-80 );
--color-masterbar-border: var( --studio-blue-80 );
--color-masterbar-text: var( --studio-white );
--color-masterbar-item-hover-background: var( --studio-blue-90 );
--color-masterbar-item-active-background: var( --studio-blue-100 );
--color-masterbar-item-new-editor-background: var( --studio-gray-50 );
--color-masterbar-item-new-editor-hover-background: var( --studio-gray-60 );
--color-masterbar-unread-dot-background: var( --color-accent-30 );
--color-masterbar-toggle-drafts-editor-background: var( --studio-gray-60 );
--color-masterbar-toggle-drafts-editor-hover-background: var( --studio-gray-40 );
--color-masterbar-toggle-drafts-editor-border: var( --studio-gray-10 );

--color-sidebar-background: var( --studio-blue-60 );
--color-sidebar-background-rgb: var( --studio-blue-60-rgb );
--color-sidebar-border: var( --studio-blue-70 );
--color-sidebar-text: var( --studio-white );
--color-sidebar-text-rgb: var( --studio-white-rgb );
--color-sidebar-text-alternative: var( --studio-blue-5 );
--color-sidebar-gridicon-fill: var( --studio-blue-5 );
--color-sidebar-menu-selected-background: var( --studio-yellow-20 );
--color-sidebar-menu-selected-background-rgb: var( --studio-yellow-20-rgb );
--color-sidebar-menu-selected-text: var( --studio-blue-90 );
--color-sidebar-menu-selected-text-rgb: var( --studio-blue-90-rgb );
--color-sidebar-menu-hover-background: var( --studio-blue-50 );
--color-sidebar-menu-hover-background-rgb: var( --studio-blue-50-rgb );
--color-sidebar-menu-hover-text: var( --studio-white );
}