Skip to content

Commit

Permalink
fix(deps): update wordpress monorepo (#42835)
Browse files Browse the repository at this point in the history 
* fix(deps): update wordpress monorepo

* Replace radius-round-rectangle with radius-block-ui

* O2 Blocks: Use @wordpress/base-styles, update color vars

* Replace light-gray-500 and 200 with gray-200 and 100

* Replace panel-padding with grid-unit-20

* Gutenboarding: Fix radio control styling

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Bernie Reiter <ockham@raz.or.at>
  • Loading branch information
@renovate @renovate-bot @ockham
3 people authored Jul 29, 2020
1 parent c1d507f commit c03f756
Show file tree
Hide file tree
Showing 25 changed files with 1,662 additions and 523 deletions.
6 changes: 3 additions & 3 deletions ...ull-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-item/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
width: 100%;
height: auto;
margin: 0;
padding: ($panel-padding / 2) $panel-padding;
padding: ( $grid-unit-20 / 2 ) $grid-unit-20;
text-align: initial;
color: $white;

Expand All @@ -23,7 +23,7 @@
box-shadow: none !important;
outline: none !important;
border-radius: 0;
padding: ( ( $panel-padding / 2 ) - 1 ) ( $panel-padding - 1 );
padding: ( ( $grid-unit-20 / 2 ) - 1 ) ( $grid-unit-20 - 1 );
}

&.is-selected {
Expand All @@ -50,7 +50,7 @@
.wpcom-block-editor-nav-item__label {
display: inline-block;
padding: 4px;
border-radius: $radius-round-rectangle;
border-radius: $radius-block-ui;
background: $dark-gray-500;
font-weight: 600;
margin-left: 4px;
Expand Down
4 changes: 2 additions & 2 deletions ...-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $transition-period: 100ms;
}

.wpcom-block-editor-nav-sidebar-nav-sidebar__site-title {
padding: 8px 16px;
padding: 8px 16px;
margin-top: 14px;

h2 {
Expand Down Expand Up @@ -122,7 +122,7 @@ $transition-period: 100ms;
}

.wpcom-block-editor-nav-sidebar-nav-sidebar__list-heading {
padding: $panel-padding;
padding: $grid-unit-20;
font-size: $big-font-size;
color: $white;
}
Expand Down
18 changes: 9 additions & 9 deletions apps/full-site-editing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@
"@babel/core": "^7.9.0",
"@testing-library/jest-dom": "^5.9.0",
"@testing-library/react": "^10.0.5",
"@wordpress/a11y": "^2.9.0",
"@wordpress/a11y": "^2.11.0",
"@wordpress/api-fetch": "*",
"@wordpress/base-styles": "1.9.0",
"@wordpress/base-styles": "2.0.1",
"@wordpress/block-editor": "*",
"@wordpress/blocks": "*",
"@wordpress/components": "*",
"@wordpress/compose": "*",
"@wordpress/data": "*",
"@wordpress/data-controls": "*",
"@wordpress/date": "*",
"@wordpress/dependency-extraction-webpack-plugin": "^2.6.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.8.0",
"@wordpress/dom-ready": "*",
"@wordpress/e2e-test-utils": "^4.7.0",
"@wordpress/e2e-test-utils": "^4.11.1",
"@wordpress/edit-post": "*",
"@wordpress/editor": "*",
"@wordpress/element": "*",
Expand All @@ -121,13 +121,13 @@
"@wordpress/html-entities": "*",
"@wordpress/i18n": "*",
"@wordpress/icons": "*",
"@wordpress/interface": "^0.6.0",
"@wordpress/interface": "^0.7.3",
"@wordpress/keycodes": "*",
"@wordpress/nux": "^3.16.0",
"@wordpress/nux": "^3.20.3",
"@wordpress/plugins": "*",
"@wordpress/rich-text": "*",
"@wordpress/scripts": "^9.1.0",
"@wordpress/server-side-render": "^1.12.0",
"@wordpress/scripts": "^12.1.1",
"@wordpress/server-side-render": "^1.16.3",
"@wordpress/url": "*",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
Expand All @@ -147,7 +147,7 @@
"devDependencies": {
"@types/wordpress__plugins": "^2.3.6",
"@babel/preset-typescript": "^7.8.3",
"@wordpress/eslint-plugin": "^6.0.0",
"@wordpress/eslint-plugin": "^7.1.0",
"babel-jest": "^26.0.1"
}
}
19 changes: 10 additions & 9 deletions apps/o2-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
"build": "check-npm-client && calypso-build editor='./src/editor.js' --env.WP"
},
"dependencies": {
"@wordpress/api-fetch": "^3.15.0",
"@wordpress/block-editor": "^3.11.0",
"@wordpress/blocks": "^6.16.0",
"@wordpress/components": "^9.6.0",
"@wordpress/data": "^4.18.0",
"@wordpress/editor": "^9.16.0",
"@wordpress/element": "^2.14.0",
"@wordpress/hooks": "^2.8.0",
"@wordpress/i18n": "^3.12.0",
"@wordpress/api-fetch": "^3.18.0",
"@wordpress/base-styles": "^2.0.1",
"@wordpress/block-editor": "^4.3.3",
"@wordpress/blocks": "^6.20.3",
"@wordpress/components": "^10.0.3",
"@wordpress/data": "^4.22.3",
"@wordpress/editor": "^9.20.3",
"@wordpress/element": "^2.16.0",
"@wordpress/hooks": "^2.9.0",
"@wordpress/i18n": "^3.14.0",
"classnames": "^2.2.6",
"lodash": "^4.17.15",
"moment": "^2.26.0"
Expand Down
38 changes: 7 additions & 31 deletions apps/o2-blocks/src/todo/editor.scss
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,4 @@
// Hugo's new WordPress shades of gray
// from http://codepen.io/hugobaeta/pen/grJjVp
$black: #000;
$dark-gray-900: #191e23;
$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;
$dark-gray-200: #7e8993;
$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;
@import '~@wordpress/base-styles/colors';

$color-accent-green: #31843f;

Expand All @@ -33,7 +13,7 @@ $color-accent-green: #31843f;

// Individual to-do list item.
.wp-block-a8c-todo__item {
border-bottom: 1px solid $light-gray-500;
border-bottom: 1px solid $gray-200;
display: flex;
justify-content: space-between;
padding: 4px 0;
Expand All @@ -43,7 +23,7 @@ $color-accent-green: #31843f;
.item-status {
display: inline-block;
content: '';
border: 1px solid $light-gray-500;
border: 1px solid $gray-200;
border-radius: 50%;
margin: 7px 8px 0 0;
height: 16px;
Expand Down Expand Up @@ -85,14 +65,14 @@ $color-accent-green: #31843f;
border-radius: 4px;
box-shadow: none;
background: none;
color: $light-gray-500;
color: $gray-200;

.dashicon {
fill: $light-gray-500;
fill: $gray-200;
}

&:hover {
border-color: $light-gray-200;
border-color: $gray-100;

.dashicon {
fill: $dark-gray-500;
Expand All @@ -108,7 +88,7 @@ $color-accent-green: #31843f;
font-size: 13px !important; // yep, I'm a monster.
color: $dark-gray-500;
border: 1px solid $light-gray-700;
background: $light-gray-200;
background: $gray-100;
box-shadow: 0 1px 0 $light-gray-700;
margin: 0;
height: 33px;
Expand All @@ -123,10 +103,7 @@ $color-accent-green: #31843f;
display: inline;
}
}

}


}

// We need to be super-specific here to be sure we're overwriting the default UL styling.
Expand All @@ -148,7 +125,6 @@ body:not( .wp-admin ) .gutenberg {
}
}


// Only show the "add new" form when it's strictly needed.
.wp-block-a8c-todo .add-new-todo-item-form {
display: none;
Expand Down
32 changes: 16 additions & 16 deletions apps/wpcom-block-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@
"wpcom-sync": "check-npm-client && ./bin/wpcom-watch-and-sync.sh"
},
"dependencies": {
"@wordpress/block-editor": "^3.11.0",
"@wordpress/blocks": "^6.16.0",
"@wordpress/components": "^9.6.0",
"@wordpress/compose": "^3.15.0",
"@wordpress/data": "^4.18.0",
"@wordpress/dom-ready": "^2.9.0",
"@wordpress/editor": "^9.16.0",
"@wordpress/element": "^2.14.0",
"@wordpress/hooks": "^2.8.0",
"@wordpress/i18n": "^3.12.0",
"@wordpress/icons": "^2.0.0",
"@wordpress/interface": "^0.6.0",
"@wordpress/plugins": "^2.16.0",
"@wordpress/rich-text": "^3.16.0",
"@wordpress/url": "^2.15.0",
"@wordpress/block-editor": "^4.3.3",
"@wordpress/blocks": "^6.20.3",
"@wordpress/components": "^10.0.3",
"@wordpress/compose": "^3.19.3",
"@wordpress/data": "^4.22.3",
"@wordpress/dom-ready": "^2.10.0",
"@wordpress/editor": "^9.20.3",
"@wordpress/element": "^2.16.0",
"@wordpress/hooks": "^2.9.0",
"@wordpress/i18n": "^3.14.0",
"@wordpress/icons": "^2.4.0",
"@wordpress/interface": "^0.7.3",
"@wordpress/plugins": "^2.20.3",
"@wordpress/rich-text": "^3.20.3",
"@wordpress/url": "^2.17.0",
"debug": "^4.1.1",
"jquery": "^1.12.3",
"lodash": "^4.17.15",
Expand All @@ -49,7 +49,7 @@
},
"devDependencies": {
"@automattic/calypso-build": "^6.1.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.6.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.8.0",
"enzyme": "^3.11.0",
"npm-run-all": "^4.1.5"
}
Expand Down
2 changes: 1 addition & 1 deletion client/assets/stylesheets/gutenboarding.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// Change loading logo's color while Calypso boots
.wpcom-site__logo {
fill: $light-gray-500;
fill: $gray-200;
}

// Hide Calypso header while Calypso boots
Expand Down
2 changes: 1 addition & 1 deletion client/landing/gutenboarding/components/domain-picker-button/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
&.components-button {
@include onboarding-medium-text;
background: var( --studio-blue-0 );
border-radius: $radius-round-rectangle;
border-radius: $radius-block-ui;
color: var( --studio-blue-40 );
max-width: 100%;
height: auto; // prevent clipping when there are 2 lines
Expand Down
4 changes: 2 additions & 2 deletions client/landing/gutenboarding/components/header/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ $padding--gutenboarding__header: $grid-unit-10;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid $light-gray-500;
border-bottom: 1px solid $gray-200;
height: $onboarding-header-height;
background: $white;
z-index: onboarding-z-index( '.onboarding__header' );
Expand All @@ -59,7 +59,7 @@ $padding--gutenboarding__header: $grid-unit-10;
display: inline-block;
padding: 1px 8px;
margin: 0 4px;
border: 1px solid $light-gray-500;
border: 1px solid $gray-200;
text-transform: uppercase;
}

Expand Down
2 changes: 1 addition & 1 deletion client/landing/gutenboarding/onboarding-block/acquire-intent/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

.acquire-intent--with-skip {
.site-title__input::after {
background-image: linear-gradient( to right, $light-gray-700, $light-gray-200 );
background-image: linear-gradient( to right, $light-gray-700, $gray-100 );
}
}

Expand Down
56 changes: 28 additions & 28 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,34 +37,34 @@
"@emotion/core": "^10.0.27",
"@emotion/styled": "^10.0.27",
"@github/webauthn-json": "^0.4.1",
"@wordpress/api-fetch": "^3.15.0",
"@wordpress/base-styles": "^1.8.0",
"@wordpress/block-editor": "^3.11.0",
"@wordpress/block-library": "^2.18.0",
"@wordpress/blocks": "^6.16.0",
"@wordpress/components": "^9.6.0",
"@wordpress/compose": "^3.15.0",
"@wordpress/core-data": "^2.16.0",
"@wordpress/data": "^4.18.0",
"@wordpress/data-controls": "^1.12.0",
"@wordpress/dom": "^2.9.0",
"@wordpress/edit-post": "^3.17.0",
"@wordpress/editor": "^9.16.0",
"@wordpress/element": "^2.14.0",
"@wordpress/format-library": "^1.18.0",
"@wordpress/i18n": "^3.12.0",
"@wordpress/icons": "^2.0.0",
"@wordpress/is-shallow-equal": "^2.0.0",
"@wordpress/keycodes": "^2.12.0",
"@wordpress/notices": "^2.4.0",
"@wordpress/nux": "^3.16.0",
"@wordpress/plugins": "^2.16.0",
"@wordpress/redux-routine": "^3.9.0",
"@wordpress/rich-text": "^3.16.0",
"@wordpress/server-side-render": "^1.12.0",
"@wordpress/shortcode": "^2.7.0",
"@wordpress/url": "^2.15.0",
"@wordpress/viewport": "^2.17.0",
"@wordpress/api-fetch": "^3.18.0",
"@wordpress/base-styles": "^2.0.1",
"@wordpress/block-editor": "^4.3.3",
"@wordpress/block-library": "^2.22.3",
"@wordpress/blocks": "^6.20.3",
"@wordpress/components": "^10.0.3",
"@wordpress/compose": "^3.19.3",
"@wordpress/core-data": "^2.20.3",
"@wordpress/data": "^4.22.3",
"@wordpress/data-controls": "^1.16.3",
"@wordpress/dom": "^2.13.1",
"@wordpress/edit-post": "^3.21.3",
"@wordpress/editor": "^9.20.3",
"@wordpress/element": "^2.16.0",
"@wordpress/format-library": "^1.22.3",
"@wordpress/i18n": "^3.14.0",
"@wordpress/icons": "^2.4.0",
"@wordpress/is-shallow-equal": "^2.1.0",
"@wordpress/keycodes": "^2.14.0",
"@wordpress/notices": "^2.8.3",
"@wordpress/nux": "^3.20.3",
"@wordpress/plugins": "^2.20.3",
"@wordpress/redux-routine": "^3.10.0",
"@wordpress/rich-text": "^3.20.3",
"@wordpress/server-side-render": "^1.16.3",
"@wordpress/shortcode": "^2.9.0",
"@wordpress/url": "^2.17.0",
"@wordpress/viewport": "^2.21.3",
"archiver": "^3.1.1",
"autosize": "^4.0.2",
"body-parser": "^1.19.0",
Expand Down
Loading

0 comments on commit c03f756

Please sign in to comment.