diff --git a/packages/rich-text-editor/src/styles/vaadin-rich-text-editor-base-styles.js b/packages/rich-text-editor/src/styles/vaadin-rich-text-editor-base-styles.js index 96787728ff4..cffccd56d0a 100644 --- a/packages/rich-text-editor/src/styles/vaadin-rich-text-editor-base-styles.js +++ b/packages/rich-text-editor/src/styles/vaadin-rich-text-editor-base-styles.js @@ -13,10 +13,6 @@ import { icons } from './vaadin-rich-text-editor-base-icons.js'; const base = css` :host { - background: var(--vaadin-rich-text-editor-background, var(--vaadin-background-color)); - border: var(--vaadin-input-field-border-width, 1px) solid - var(--vaadin-input-field-border-color, var(--vaadin-border-color)); - border-radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m)); box-sizing: border-box; display: flex; flex-direction: column; @@ -41,7 +37,11 @@ const base = css` flex-direction: column; max-height: inherit; min-height: inherit; - border-radius: inherit; + background: var(--vaadin-rich-text-editor-background, var(--vaadin-background-color)); + border: var(--vaadin-input-field-border-width, 1px) solid + var(--vaadin-input-field-border-color, var(--vaadin-border-color)); + border-radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m)); + outline-offset: calc(var(--vaadin-input-field-border-width, 1px) * -1); contain: paint; } diff --git a/packages/rich-text-editor/test/auto-grow.test.js b/packages/rich-text-editor/test/auto-grow.test.js index 104bada99c2..995718fc10a 100644 --- a/packages/rich-text-editor/test/auto-grow.test.js +++ b/packages/rich-text-editor/test/auto-grow.test.js @@ -42,7 +42,11 @@ describe('rich text editor', () => { ['height', 'min-height', 'max-height'].forEach((definedValue, key) => { describe(`defined ${definedValue}`, () => { beforeEach(async () => { - rte = fixtureSync(``); + rte = fixtureSync(` + + `); await nextRender(); editorContainer = rte.shadowRoot.querySelector('.vaadin-rich-text-editor-container'); editorContentContainer = rte.shadowRoot.querySelector('.ql-container'); diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/background-popup.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/background-popup.png index b7c58877f0f..8e22648ebdc 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/background-popup.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/background-popup.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/basic.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/basic.png index ab843073263..a08291e622f 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/basic.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/basic.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/color-popup.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/color-popup.png index 7ba80488222..db75576c816 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/color-popup.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/color-popup.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/disabled.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/disabled.png index 86df9b838ed..b33776882f8 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/disabled.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/disabled.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-indent.png index a52c747e1bd..c5b6cc36b7b 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-indent.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-basic.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-basic.png index 9b4d56ccdfc..b7b6b50729c 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-basic.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-basic.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-bullet-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-bullet-indent.png index 70169b761eb..6322f267b30 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-bullet-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-bullet-indent.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-ordered-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-ordered-indent.png index 38d7120fd4e..c97b79a4408 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-ordered-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/ltr-list-ordered-indent.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/max-height.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/max-height.png index 472865afc94..0a244e47c43 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/max-height.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/max-height.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/min-height.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/min-height.png index a4ea7edb7ef..109ab579348 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/min-height.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/min-height.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-blocks.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-blocks.png index fe7b24337fc..9511b2e11b3 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-blocks.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-blocks.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-headings.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-headings.png index 9c3998fc2db..10c5c0619f9 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-headings.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-headings.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-alignment.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-alignment.png index 194152b9a59..39901066ef2 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-alignment.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-alignment.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-formatting.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-formatting.png index bde04a5cfdd..e05001802bd 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-formatting.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rich-content-text-formatting.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-indent.png index fd3953afa6d..c7d1d2129c3 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-indent.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-basic.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-basic.png index 6af52f384ca..ed642ed392c 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-basic.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-basic.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-bullet-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-bullet-indent.png index e469b435bc0..e6f03541c2a 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-bullet-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-bullet-indent.png differ diff --git a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-ordered-indent.png b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-ordered-indent.png index b872e90d93d..1947b055f92 100644 Binary files a/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-ordered-indent.png and b/packages/rich-text-editor/test/visual/base/screenshots/rich-text-editor/baseline/rtl-list-ordered-indent.png differ diff --git a/packages/vaadin-lumo-styles/src/components/rich-text-editor.css b/packages/vaadin-lumo-styles/src/components/rich-text-editor.css index fe2c625a33b..83f6256ae35 100644 --- a/packages/vaadin-lumo-styles/src/components/rich-text-editor.css +++ b/packages/vaadin-lumo-styles/src/components/rich-text-editor.css @@ -9,9 +9,6 @@ font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-m); line-height: var(--lumo-line-height-m); - background: transparent; - border: none; - border-radius: 0; -webkit-text-size-adjust: 100%; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -25,6 +22,12 @@ outline: none; } + .vaadin-rich-text-editor-container { + background: transparent; + border: none; + border-radius: 0; + } + [part='content'] { background-color: var(--lumo-base-color); }