Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

t/135 Removed "vanilla" Lark #139

Merged
merged 19 commits into from
Feb 16, 2018
Merged

t/135 Removed "vanilla" Lark #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ec78474
Removed styling for .ck-editor-toolbar.
Feb 15, 2018
c901553
Removed button variables for ck-editor-toolbar.
Feb 15, 2018
5a51a62
Added missing semicolons.
Feb 15, 2018
48696a1
Changed default button border and background to transparent color.
Feb 15, 2018
9610961
Docs: removed . ck-editor-toolbar-button.
Feb 15, 2018
9c2581c
Merge branch 'master' of https://github.com/ckeditor/ckeditor5-theme-…
Feb 15, 2018
46523c0
Removed obsolete variable ck-editor-toolbar background.
Feb 15, 2018
633bdc1
Removed not used CSS fix.
Feb 15, 2018
5980302
Removed `.ck-editor-toolbar` CSS variables.
Feb 16, 2018
ff9c586
Tests: Wrapped buttons and icons in ck-toolbar.
Feb 16, 2018
eea41d8
Fixed failing test - typo.
Feb 16, 2018
d43a6a5
Bringing back white background for panel-background.
Feb 16, 2018
9710ab8
Moved `.ck-toolbar` background to toolbar.css from editorclassic.css
Feb 16, 2018
9e8550e
Changed to transparent border for button-action.
Feb 16, 2018
febcfb6
Removed green border from action-button default state.
Feb 16, 2018
88d35cb
Removed border from `.ck-button`.
Feb 16, 2018
5c9fc0d
Added a transparent border to all buttons to prevent flickering when …
oleq Feb 16, 2018
fa57d3d
Fixed proper background for toolbar arrow.
Feb 16, 2018
f19411f
Removed button border when :focused because it was too strong.
oleq Feb 16, 2018
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
34 changes: 11 additions & 23 deletions docs/_snippets/examples/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
--ck-color-button-default-disabled-background: var(--ck-custom-background);
--ck-color-button-default-disabled-border: var(--ck-custom-border);

--ck-color-button-on-background: var(--ck-custom-foreground);
--ck-color-button-on-border: var(--ck-custom-border);
--ck-color-button-on-focus-background: hsl(255, 4%, 21%);
--ck-color-button-on-focus-border: hsl(0, 0%, 20%);
--ck-color-button-on-active-background: hsl(255, 4%, 20%);
--ck-color-button-on-active-border: hsl(300, 1%, 19%);
--ck-color-button-on-active-shadow: hsl(240, 3%, 19%);
--ck-color-button-on-disabled-background: var(--ck-custom-foreground);
--ck-color-button-on-disabled-border: var(--ck-custom-border);
--ck-color-button-on-background: hsl(0, 0%, 24%);
--ck-color-button-on-border: transparent;
--ck-color-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-button-on-focus-border: transparent;
--ck-color-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-button-on-active-border: transparent;
--ck-color-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-button-on-disabled-background: transparent;
--ck-color-button-on-disabled-border: transparent;

--ck-color-button-action-background: hsl(168, 76%, 42%);
--ck-color-button-action-border: hsl(168, 60%, 55%);
Expand Down Expand Up @@ -95,20 +95,8 @@

/* -- Overrides the default colors used by the editor --------------------------------------- */

--ck-color-editor-border: var(--ck-custom-background);
--ck-color-editor-toolbar-background: var(--ck-custom-background);

--ck-color-editor-toolbar-button-on-background: hsl(0, 0%, 24%);
--ck-color-editor-toolbar-button-on-border: transparent;
--ck-color-editor-toolbar-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-editor-toolbar-button-on-focus-border: transparent;
--ck-color-editor-toolbar-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-editor-toolbar-button-on-active-border: transparent;
--ck-color-editor-toolbar-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-editor-toolbar-button-on-disabled-background: transparent;
--ck-color-editor-toolbar-button-on-disabled-border: transparent;

--ck-color-editor-dropdown-background: hsl(270, 1%, 33%);
--ck-color-base-border: var(--ck-custom-background);
--ck-color-dropdown-background: hsl(270, 1%, 33%);

/* -- Overrides the default colors used by ckeditor5-image package -------------------------- */

Expand Down
36 changes: 12 additions & 24 deletions docs/framework/guides/theme-customization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ The file containing custom variables will be named `custom.css` and it will look
--ck-color-button-default-disabled-background: var(--ck-custom-background);
--ck-color-button-default-disabled-border: var(--ck-custom-border);

--ck-color-button-on-background: var(--ck-custom-foreground);
--ck-color-button-on-border: var(--ck-custom-border);
--ck-color-button-on-focus-background: hsl(255, 4%, 21%);
--ck-color-button-on-focus-border: hsl(0, 0%, 20%);
--ck-color-button-on-active-background: hsl(255, 4%, 20%);
--ck-color-button-on-active-border: hsl(300, 1%, 19%);
--ck-color-button-on-active-shadow: hsl(240, 3%, 19%);
--ck-color-button-on-disabled-background: var(--ck-custom-foreground);
--ck-color-button-on-disabled-border: var(--ck-custom-border);
--ck-color-button-on-background: hsl(0, 0%, 24%);
--ck-color-button-on-border: transparent;
--ck-color-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-button-on-focus-border: transparent;
--ck-color-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-button-on-active-border: transparent;
--ck-color-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-button-on-disabled-background: transparent;
--ck-color-button-on-disabled-border: transparent;

--ck-color-button-action-background: hsl(168, 76%, 42%);
--ck-color-button-action-border: hsl(168, 60%, 55%);
Expand Down Expand Up @@ -152,7 +152,7 @@ The file containing custom variables will be named `custom.css` and it will look

/* -- Overrides the default .ck-toolbar class colors ---------------------------------------- */

--ck-color-toolbar-background: var(--ck-custom-foreground);
--ck-color-toolbar-background: var(--ck-custom-background);
--ck-color-toolbar-border: var(--ck-custom-border);

/* -- Overrides the default .ck-tooltip class colors ---------------------------------------- */
Expand All @@ -162,20 +162,8 @@ The file containing custom variables will be named `custom.css` and it will look

/* -- Overrides the default colors used by the editor --------------------------------------- */

--ck-color-editor-border: var(--ck-custom-background);
--ck-color-editor-toolbar-background: var(--ck-custom-background);

--ck-color-editor-toolbar-button-on-background: hsl(0, 0%, 24%);
--ck-color-editor-toolbar-button-on-border: transparent;
--ck-color-editor-toolbar-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-editor-toolbar-button-on-focus-border: transparent;
--ck-color-editor-toolbar-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-editor-toolbar-button-on-active-border: transparent;
--ck-color-editor-toolbar-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-editor-toolbar-button-on-disabled-background: transparent;
--ck-color-editor-toolbar-button-on-disabled-border: transparent;

--ck-color-editor-dropdown-background: hsl(270, 1%, 33%);
--ck-color-base-border: var(--ck-custom-background);
--ck-color-dropdown-background: hsl(270, 1%, 33%);

/* -- Overrides the default colors used by ckeditor5-image package -------------------------- */

Expand Down
25 changes: 12 additions & 13 deletions tests/manual/inverted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

/* -- Overrides the default .ck-toolbar class colors ---------------------------------------- */

--ck-color-toolbar-background: var(--ck-custom-foreground);
--ck-color-toolbar-background: var(--ck-custom-background);
--ck-color-toolbar-border: var(--ck-custom-border);

/* -- Overrides the default .ck-tooltip class colors ---------------------------------------- */
Expand All @@ -91,20 +91,19 @@

/* -- Overrides the default colors used by the editor --------------------------------------- */

--ck-color-editor-border: var(--ck-custom-background);
--ck-color-editor-toolbar-background: var(--ck-custom-background);
--ck-color-base-border: var(--ck-custom-background);

--ck-color-editor-toolbar-button-on-background: hsl(0, 0%, 18%);
--ck-color-editor-toolbar-button-on-border: transparent;
--ck-color-editor-toolbar-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-editor-toolbar-button-on-focus-border: transparent;
--ck-color-editor-toolbar-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-editor-toolbar-button-on-active-border: transparent;
--ck-color-editor-toolbar-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-editor-toolbar-button-on-disabled-background: transparent;
--ck-color-editor-toolbar-button-on-disabled-border: transparent;
--ck-color-button-on-background: hsl(0, 0%, 18%);
--ck-color-button-on-border: transparent;
--ck-color-button-on-focus-background: hsl(0, 0%, 21%);
--ck-color-button-on-focus-border: transparent;
--ck-color-button-on-active-background: hsl(0, 0%, 15%);
--ck-color-button-on-active-border: transparent;
--ck-color-button-on-active-shadow: hsl(0, 0%, 18%);
--ck-color-button-on-disabled-background: transparent;
--ck-color-button-on-disabled-border: transparent;

--ck-color-editor-dropdown-background: hsl(270, 1%, 33%);
--ck-color-editor-background: hsl(270, 1%, 33%);

/* -- Overrides the default colors used by ckeditor5-image package -------------------------- */

Expand Down
6 changes: 0 additions & 6 deletions tests/manual/theme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ <h3>Button: Icon</h3>

<div id="button-icon-custom"></div>

<br/>
<br/>

<div id="button-icon-states"></div>
Expand All @@ -68,7 +67,6 @@ <h3>Button: Responsiveness</h3>

<h3>Button: Tooltip</h3>
<div id="button-tooltip" class="ck-reset_all"></div>
<hr/>

<h2>Dropdown</h2>

Expand All @@ -78,8 +76,6 @@ <h3>ListDropdown</h3>
<h3>ButtonDropdown</h3>
<div id="button-dropdown" class="ck-reset_all"></div>

<hr/>

<h2>Toolbar</h2>

<h3>Toolbar: Text</h3>
Expand All @@ -100,8 +96,6 @@ <h3>Toolbar: Item separators</h3>
<h3>Toolbar: Multi-row</h3>
<div id="toolbar-multi-row" class="ck-reset_all"></div>

<hr/>

<h2>Inputs</h2>

<h3>Labeled</h3>
Expand Down
Loading