Skip to content

Commit

Permalink
Migrate CoBlocks to use @wordpress/base-styles package (godaddy-wordp…
Browse files Browse the repository at this point in the history
…ress#1651)

* start migration to base-styles

* migrate mixins

* add breakpoints

* Lock @wordpress/base-styles at version included with "wp/5.5"

Co-authored-by: JR Tashjian <[email protected]>
  • Loading branch information
AnthonyLedesma and jrtashjian authored Aug 31, 2020
1 parent fac3d6e commit d00a300
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 746 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"devDependencies": {
"@babel/plugin-proposal-class-properties": "7.10.4",
"@testing-library/jest-dom": "^4.2.4",
"@wordpress/base-styles": "2.0.1",
"@wordpress/block-editor": "3.1.0",
"@wordpress/block-library": "2.8.0",
"@wordpress/blocks": "^6.10.0",
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/dynamic-separator/styles/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

&.is-selected {
background: $light-gray-200;
background: $gray-200;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/gallery-collage/styles/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
.is-style-layered {

.block-editor-media-placeholder {
background: $light-gray-200;
background: $gray-200;
}

.components-form-file-upload {
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/row/styles/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
display: block;

.components-placeholder {
color: $dark-gray-900;
color: $gray-900;
}

.wp-block-coblocks-row__inner.has-no-gutter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
box-shadow: none !important;

.dashicon {
color: $dark-gray-900 !important;
color: $gray-900 !important;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/crop-settings/styles/editor.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.components-coblocks-image-control {
background-color: $light-gray-200;
background-color: $gray-200;
margin-bottom: 0 !important;
margin-left: auto;
margin-right: auto;
Expand Down
4 changes: 2 additions & 2 deletions src/components/typography-controls/styles/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
width: 130px;

&:hover {
background: $light-gray-100;
background: $gray-100;
border-color: #999;
color: $dark-gray-800;
text-decoration: none;
}

&:active:enabled {
background: $light-gray-200;
background: $gray-200;
}

&:focus {
Expand Down
12 changes: 5 additions & 7 deletions src/styles/editor/core/_breakpoints.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// Breakpoints & Media Queries
@import "node_modules/@wordpress/base-styles/breakpoints";

/**
* Deprecated breakpoints.
* Please avoid using these.
*/
// Most used breakpoints
$break-huge: 1440px;
$break-wide: 1280px;
$break-large: 960px;
$break-large-max: 959px; // admin sidebar auto folds
$break-medium: 782px; // adminbar goes big
$break-small: 600px;
$break-small-max: 599px;
$break-mobile: 480px;

// All media queries currently in WordPress:
//
Expand Down
90 changes: 7 additions & 83 deletions src/styles/editor/core/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,87 +1,11 @@
// Colors
@import "node_modules/@wordpress/base-styles/colors";

// Hugo's new WordPress shades of gray,
// from http://codepen.io/hugobaeta/pen/grJjVp
$black: #000;
$dark-gray-900: #191e23;
/**
* Deprecated colors.
* Please avoid using these.
*/
$blue-medium-focus: #007cba;
$dark-gray-800: #23282d;
$dark-gray-700: #32373c;
$dark-gray-600: #40464d;
$dark-gray-500: #555d66; // Use this most of the time for dark items.
$dark-gray-400: #606a73;
$dark-gray-300: #6c7781; // Lightest gray that can be used for AA text contrast.
$dark-gray-200: #7e8993;
$dark-gray-150: #8d96a0; // Lightest gray that can be used for AA non-text contrast.
$dark-gray-100: #8f98a1;
$light-gray-900: #a2aab2;
$light-gray-800: #b5bcc2;
$light-gray-700: #ccd0d4;
$light-gray-600: #d7dade;
$light-gray-500: #e2e4e7; // Good for "grayed" items and borders
$light-gray-400: #e8eaeb;
$light-gray-300: #edeff0;
$light-gray-200: #f3f4f5;
$light-gray-100: #f8f9f9;
$white: #fff;

// Dark opacities, for use with light themes.
$dark-opacity-900: rgba(#000510, 0.9);
$dark-opacity-800: rgba(#00000a, 0.85);
$dark-opacity-700: rgba(#06060b, 0.8);
$dark-opacity-600: rgba(#000913, 0.75);
$dark-opacity-500: rgba(#0a1829, 0.7);
$dark-opacity-400: rgba(#0a1829, 0.65);
$dark-opacity-300: rgba(#0e1c2e, 0.62);
$dark-opacity-200: rgba(#162435, 0.55);
$dark-opacity-100: rgba(#223443, 0.5);
$dark-opacity-light-900: rgba(#304455, 0.45);
$dark-opacity-light-800: rgba(#425863, 0.4);
$dark-opacity-light-700: rgba(#667886, 0.35);
$dark-opacity-light-600: rgba(#7b86a2, 0.3);
$dark-opacity-light-500: rgba(#9197a2, 0.25);
$dark-opacity-light-400: rgba(#95959c, 0.2);
$dark-opacity-light-300: rgba(#829493, 0.15);
$dark-opacity-light-200: rgba(#8b8b96, 0.1);
$dark-opacity-light-100: rgba(#747474, 0.05);

// Light opacities, for use with dark themes.
$light-opacity-900: rgba($white, 1);
$light-opacity-800: rgba($white, 0.9);
$light-opacity-700: rgba($white, 0.85);
$light-opacity-600: rgba($white, 0.8);
$light-opacity-500: rgba($white, 0.75);
$light-opacity-400: rgba($white, 0.7);
$light-opacity-300: rgba($white, 0.65);
$light-opacity-200: rgba($white, 0.6);
$light-opacity-100: rgba($white, 0.55);
$light-opacity-light-900: rgba($white, 0.5);
$light-opacity-light-800: rgba($white, 0.45);
$light-opacity-light-700: rgba($white, 0.4);
$light-opacity-light-600: rgba($white, 0.35);
$light-opacity-light-500: rgba($white, 0.3);
$light-opacity-light-400: rgba($white, 0.25);
$light-opacity-light-300: rgba($white, 0.2);
$light-gray-500: #e2e4e7;
$light-opacity-light-200: rgba($white, 0.15);
$light-opacity-light-100: rgba($white, 0.1);

// Additional colors
// some from https://make.wordpress.org/design/handbook/foundations/colors/
$blue-wordpress-700: #00669b;
$blue-dark-900: #0071a1;

$blue-medium-900: #006589;
$blue-medium-800: #00739c;
$blue-medium-700: #007fac;
$blue-medium-600: #008dbe;
$blue-medium-500: #00a0d2;
$blue-medium-400: #33b3db;
$blue-medium-300: #66c6e4;
$blue-medium-200: #bfe7f3;
$blue-medium-100: #e5f5fa;
$blue-medium-highlight: #b3e7fe;
$blue-medium-focus: #007cba;

// Alert colors
$alert-yellow: #f0b849;
$alert-red: #d94f4f;
$alert-green: #4ab866;
Loading

0 comments on commit d00a300

Please sign in to comment.