From 58bc9a09d63d4a89caa9fa133a84b67a5b1ff90f Mon Sep 17 00:00:00 2001 From: Mateusz Baginski Date: Thu, 23 May 2024 12:52:57 +0200 Subject: [PATCH 1/4] Fix incorrect height of buttons placed in list --- .../theme/ckeditor5-ui/components/list/list.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css index b45ff3a1841..5a66bf1b190 100644 --- a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css +++ b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css @@ -43,6 +43,11 @@ https://github.com/ckeditor/ckeditor5-heading/issues/63 */ padding: var(--ck-list-button-padding); + & .ck-button__label { + /* https://github.com/ckeditor/ckeditor5-heading/issues/63 */ + line-height: calc(1.2 * var(--ck-line-height-base) * var(--ck-font-size-base)); + } + &:active { box-shadow: none; } From 9b8b54cea90369d80c7bade2f892206c48be2d55 Mon Sep 17 00:00:00 2001 From: Mateusz Baginski Date: Wed, 5 Jun 2024 08:07:22 +0200 Subject: [PATCH 2/4] Adjust CSS `line-height` --- packages/ckeditor5-heading/theme/heading.css | 4 ++++ .../theme/ckeditor5-ui/components/list/list.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/ckeditor5-heading/theme/heading.css b/packages/ckeditor5-heading/theme/heading.css index ccbb13a11e1..4001d08ff47 100644 --- a/packages/ckeditor5-heading/theme/heading.css +++ b/packages/ckeditor5-heading/theme/heading.css @@ -18,3 +18,7 @@ .ck[class*="ck-heading_heading"] { font-weight: bold; } + +.ck.ck-list__item > .ck-button[class*="ck-heading_heading"] .ck-button__label { + line-height: var(--ck-font-size-large); +} diff --git a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css index 5a66bf1b190..453dc95bc1e 100644 --- a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css +++ b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css @@ -45,7 +45,7 @@ & .ck-button__label { /* https://github.com/ckeditor/ckeditor5-heading/issues/63 */ - line-height: calc(1.2 * var(--ck-line-height-base) * var(--ck-font-size-base)); + line-height: calc(1 * var(--ck-line-height-base) * var(--ck-font-size-base)); } &:active { From f248f9f77fda933ef4abf5361e41297ff0d4780e Mon Sep 17 00:00:00 2001 From: Mateusz Baginski Date: Fri, 21 Jun 2024 15:02:40 +0200 Subject: [PATCH 3/4] fix css --- packages/ckeditor5-heading/theme/heading.css | 4 ---- .../theme/ckeditor5-ui/components/list/list.css | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/ckeditor5-heading/theme/heading.css b/packages/ckeditor5-heading/theme/heading.css index 4001d08ff47..ccbb13a11e1 100644 --- a/packages/ckeditor5-heading/theme/heading.css +++ b/packages/ckeditor5-heading/theme/heading.css @@ -18,7 +18,3 @@ .ck[class*="ck-heading_heading"] { font-weight: bold; } - -.ck.ck-list__item > .ck-button[class*="ck-heading_heading"] .ck-button__label { - line-height: var(--ck-font-size-large); -} diff --git a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css index 453dc95bc1e..dcd76387ae8 100644 --- a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css +++ b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css @@ -43,9 +43,9 @@ https://github.com/ckeditor/ckeditor5-heading/issues/63 */ padding: var(--ck-list-button-padding); - & .ck-button__label { + &:not([class*="ck-heading_heading"]) .ck-button__label { /* https://github.com/ckeditor/ckeditor5-heading/issues/63 */ - line-height: calc(1 * var(--ck-line-height-base) * var(--ck-font-size-base)); + line-height: calc(var(--ck-line-height-base) * var(--ck-font-size-base)); } &:active { From 8f7cb281c54b42f664e76dbe7e236893a34ed6f7 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Mon, 24 Jun 2024 12:10:35 +0200 Subject: [PATCH 4/4] Heading dropdown list items should keep the same line-height as other list items in the UI. --- .../theme/ckeditor5-ui/components/list/list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css index dcd76387ae8..3ab05f5e76b 100644 --- a/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css +++ b/packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css @@ -43,7 +43,7 @@ https://github.com/ckeditor/ckeditor5-heading/issues/63 */ padding: var(--ck-list-button-padding); - &:not([class*="ck-heading_heading"]) .ck-button__label { + & .ck-button__label { /* https://github.com/ckeditor/ckeditor5-heading/issues/63 */ line-height: calc(var(--ck-line-height-base) * var(--ck-font-size-base)); }