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

Stop exporting individual color objects from color values file #40387

Merged
merged 3 commits into from
Apr 19, 2022
Merged

Stop exporting individual color objects from color values file #40387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
915d92c
Stop exporting individual color objects from color values file
mirka Apr 15, 2022
9fc51f4
Add changelog
mirka Apr 15, 2022
818ce4a
Replace in React Native
mirka Apr 15, 2022
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
5 changes: 5 additions & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

### Internal

- Remove individual color object exports from the `utils/colors-values.js` file. Colors should now be used from the main `COLORS` export([#40387](https://github.com/WordPress/gutenberg/pull/40387)).


## 19.8.0 (2022-04-08)

### Enhancements
Expand Down
10 changes: 5 additions & 5 deletions packages/components/src/navigation/styles/navigation-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { isRTL } from '@wordpress/i18n';
/**
* Internal dependencies
*/
import { BASE, G2, UI } from '../../utils/colors-values';
import { COLORS } from '../../utils/colors-values';
import Button from '../../button';
import { Text } from '../../text';
import { Heading } from '../../heading';
Expand Down Expand Up @@ -155,18 +155,18 @@ export const ItemBaseUI = styled.li`
}

&.is-active {
background-color: ${ UI.theme };
color: ${ BASE.white };
background-color: ${ COLORS.ui.theme };
color: ${ COLORS.white };

> button,
> a {
color: ${ BASE.white };
color: ${ COLORS.white };
opacity: 1;
}
}

> svg path {
color: ${ G2.lightGray.ui };
color: ${ COLORS.gray[ 600 ] };
}
`;

Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/text/styles/text-mixins.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { fontFamily } from './font-family';
import css from './emotion-css';
import { G2 } from '../../utils/colors-values';
import { COLORS } from '../../utils/colors-values';

const fontWeightNormal = `font-weight: 400;`;
const fontWeightMedium = `font-weight: 500;`;
Expand Down Expand Up @@ -81,7 +81,7 @@ const sectionHeading = `
font-size: 11px;
line-height: 1.4;
text-transform: uppercase;
color: ${ G2.gray[ 700 ] }
color: ${ COLORS.gray[ 700 ] }
`;

/**
Expand Down
22 changes: 11 additions & 11 deletions packages/components/src/utils/colors-values.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { merge } from 'lodash';
*/
import { rgba } from './colors';

export const BASE = {
const BASE = {
black: '#000',
white: '#fff',
};
Expand All @@ -19,7 +19,7 @@ export const BASE = {
* "G2" refers to the movement to advance the interface of the block editor.
* https://github.com/WordPress/gutenberg/issues/18667
*/
export const G2 = {
const G2 = {
blue: {
medium: {
focus: '#007cba',
Expand Down Expand Up @@ -49,7 +49,7 @@ export const G2 = {
},
};

export const DARK_GRAY = {
const DARK_GRAY = {
900: '#191e23',
800: '#23282d',
700: '#32373c',
Expand All @@ -63,7 +63,7 @@ export const DARK_GRAY = {
placeholder: rgba( G2.gray[ 900 ], 0.62 ),
};

export const DARK_OPACITY = {
const DARK_OPACITY = {
900: rgba( '#000510', 0.9 ),
800: rgba( '#00000a', 0.85 ),
700: rgba( '#06060b', 0.8 ),
Expand All @@ -76,7 +76,7 @@ export const DARK_OPACITY = {
backgroundFill: rgba( DARK_GRAY[ 700 ], 0.7 ),
};

export const DARK_OPACITY_LIGHT = {
const DARK_OPACITY_LIGHT = {
900: rgba( '#304455', 0.45 ),
800: rgba( '#425863', 0.4 ),
700: rgba( '#667886', 0.35 ),
Expand All @@ -88,7 +88,7 @@ export const DARK_OPACITY_LIGHT = {
100: rgba( '#747474', 0.05 ),
};

export const LIGHT_GRAY = {
const LIGHT_GRAY = {
900: '#a2aab2',
800: '#b5bcc2',
700: '#ccd0d4',
Expand All @@ -101,7 +101,7 @@ export const LIGHT_GRAY = {
placeholder: rgba( BASE.white, 0.65 ),
};

export const LIGHT_OPACITY_LIGHT = {
const LIGHT_OPACITY_LIGHT = {
900: rgba( BASE.white, 0.5 ),
800: rgba( BASE.white, 0.45 ),
700: rgba( BASE.white, 0.4 ),
Expand All @@ -117,7 +117,7 @@ export const LIGHT_OPACITY_LIGHT = {
// Additional colors.
// Some are from https://make.wordpress.org/design/handbook/foundations/colors/.

export const BLUE = {
const BLUE = {
wordpress: {
700: '#00669b',
},
Expand All @@ -139,19 +139,19 @@ export const BLUE = {
},
};

export const ALERT = {
const ALERT = {
yellow: '#f0b849',
red: '#d94f4f',
green: '#4ab866',
};

export const ADMIN = {
const ADMIN = {
theme: `var( --wp-admin-theme-color, ${ BLUE.wordpress[ 700 ] })`,
themeDark10: `var( --wp-admin-theme-color-darker-10, ${ BLUE.medium.focus })`,
};

// Namespaced values for raw colors hex codes.
export const UI = {
const UI = {
theme: ADMIN.theme,
background: BASE.white,
backgroundDisabled: LIGHT_GRAY[ 200 ],
Expand Down