Skip to content

Commit

Permalink
Merge pull request #625 from wordpress-mobile/fix/colors-and-richtext…
Browse files Browse the repository at this point in the history
…inputevent

Fix/colors and richtextinputevent
  • Loading branch information
SergioEstevao authored Feb 20, 2019
2 parents b28b394 + fd56563 commit 8ed6cb1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 51 files
+2 −2 .github/CODEOWNERS
+2 −2 docs/contributors/coding-guidelines.md
+19 −1 docs/designers-developers/developers/data/data-core-editor.md
+1 −1 gutenberg.php
+1 −1 package-lock.json
+1 −1 package.json
+3 −1 packages/block-library/src/button/index.js
+1 −1 packages/block-library/src/heading/edit.native.js
+1 −1 packages/block-library/src/paragraph/edit.native.js
+1 −1 packages/block-library/src/paragraph/style.native.scss
+1 −1 packages/block-library/src/preformatted/index.js
+30 −31 packages/components/src/color-palette/index.js
+10 −44 packages/components/src/color-palette/style.scss
+33 −27 packages/components/src/color-palette/test/__snapshots__/index.js.snap
+1 −1 packages/components/src/color-palette/test/index.js
+1 −1 packages/components/src/color-picker/style.scss
+1 −1 packages/components/src/drop-zone/provider.js
+1 −2 packages/components/src/font-size-picker/style.scss
+1 −2 packages/components/src/range-control/style.scss
+11 −0 packages/data/CHANGELOG.md
+4 −0 packages/data/README.md
+10 −8 packages/data/src/namespace-store.js
+1 −1 packages/data/src/plugins/persistence/README.md
+22 −20 packages/data/src/plugins/persistence/index.js
+136 −19 packages/data/src/plugins/persistence/test/index.js
+2 −1 packages/data/src/test/registry.js
+14 −0 packages/e2e-tests/specs/blocks/__snapshots__/preformatted.test.js.snap
+35 −0 packages/e2e-tests/specs/blocks/preformatted.test.js
+5 −0 packages/edit-post/src/style.scss
+1 −1 packages/editor/src/components/block-drop-zone/index.js
+2 −2 packages/editor/src/components/default-block-appender/index.native.js
+9 −2 packages/editor/src/components/default-block-appender/style.native.scss
+1 −1 packages/editor/src/components/index.js
+1 −1 packages/editor/src/components/index.native.js
+1 −1 packages/editor/src/components/post-title/index.native.js
+18 −3 packages/editor/src/components/rich-text/index.js
+2 −2 packages/editor/src/components/rich-text/index.native.js
+1 −1 packages/editor/src/components/rich-text/input-event.js
+1 −1 packages/editor/src/components/rich-text/input-event.native.js
+2 −0 packages/editor/src/components/rich-text/style.native.scss
+47 −7 packages/editor/src/store/actions.js
+30 −0 packages/editor/src/store/controls.js
+1 −42 packages/editor/src/store/effects.js
+2 −0 packages/editor/src/store/index.js
+36 −20 packages/editor/src/store/test/actions.js
+2 −2 packages/format-library/src/bold/index.js
+2 −2 packages/format-library/src/italic/index.js
+2 −2 packages/format-library/src/underline/index.js
+0 −1 packages/keycodes/src/index.js
+1 −1 post-content.php
+0 −1 webpack.config.js
4 changes: 2 additions & 2 deletions src/block-management/block-picker.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @format */

@import '../variables.scss';
@import './colors.scss';
@import 'variables.scss';
@import 'colors.scss';

.touchableArea {
border-radius: 8px 8px 8px 8px;
Expand Down
2 changes: 1 addition & 1 deletion src/block-management/inline-toolbar/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @format */

@import '../colors.scss';
@import 'colors.scss';

.toolbar {
flex-direction: row;
Expand Down
File renamed without changes.

0 comments on commit 8ed6cb1

Please sign in to comment.