From c5b034c9c65643bc44fb66ca4b44fbb957fe0be8 Mon Sep 17 00:00:00 2001 From: prconcepcion Date: Tue, 1 Aug 2023 09:43:01 +0800 Subject: [PATCH 1/6] added styling to prevent misalignment --- src/components/modal-design-library/editor.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss index e1754a8f2..54915ddfa 100644 --- a/src/components/modal-design-library/editor.scss +++ b/src/components/modal-design-library/editor.scss @@ -22,6 +22,7 @@ flex-direction: column; } .components-modal__header { + padding: 0px; margin: 0; height: 58px; border-bottom: 1px solid #ddd; @@ -57,7 +58,7 @@ display: flex; justify-content: flex-end; padding: 0 24px; - height: 80px; + height: 50px; align-items: center; grid-column: 2 / 3; grid-row: 1 / 2; @@ -250,6 +251,7 @@ .ugb-modal-design-library .components-modal__header-heading { display: flex; align-items: center; + padding: 0 32px; .ugb-advanced-toolbar-control { margin: 0 32px; > *, From 29c9a97b7bfd30a0c049158e8b68566179826d36 Mon Sep 17 00:00:00 2001 From: prconcepcion Date: Fri, 4 Aug 2023 18:44:22 +0800 Subject: [PATCH 2/6] made sidebar scrollable and fixed margins --- src/components/modal-design-library/editor.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss index 54915ddfa..fc337c460 100644 --- a/src/components/modal-design-library/editor.scss +++ b/src/components/modal-design-library/editor.scss @@ -31,6 +31,9 @@ } .components-button { left: 0 !important; + &.has-icon { + margin: 10px; + } } } .ugb-modal-design-library__wrapper { @@ -48,6 +51,9 @@ flex-direction: column; overflow: hidden; z-index: 1; + position: absolute; + width: 300px; + height: 100%; .ugb-control-separator { margin: 8px 0 !important; @@ -99,6 +105,7 @@ .ugb-modal-design-library__filters { overflow-y: auto; padding: 24px; + height: 100%; } /** From bf59e03b5b3d101688afa492cdf9a6057f9687dc Mon Sep 17 00:00:00 2001 From: Benjamin Intal Date: Sat, 5 Aug 2023 11:04:49 +0800 Subject: [PATCH 3/6] fix, design library button stopped opening the modal --- src/block/design-library/edit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/block/design-library/edit.js b/src/block/design-library/edit.js index 54c477aa6..8d7f833de 100644 --- a/src/block/design-library/edit.js +++ b/src/block/design-library/edit.js @@ -85,7 +85,10 @@ const Edit = props => { } return ( -
+
} label={ __( 'Stackable Design Library', i18n ) } From 814355189aaa8bf6bbec8c09e37d15c1af8987de Mon Sep 17 00:00:00 2001 From: prconcepcion Date: Sun, 6 Aug 2023 14:28:50 +0800 Subject: [PATCH 4/6] reverted changes made to sidebar --- src/components/modal-design-library/editor.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss index fc337c460..c1c393aa7 100644 --- a/src/components/modal-design-library/editor.scss +++ b/src/components/modal-design-library/editor.scss @@ -51,10 +51,6 @@ flex-direction: column; overflow: hidden; z-index: 1; - position: absolute; - width: 300px; - height: 100%; - .ugb-control-separator { margin: 8px 0 !important; width: 100% !important; @@ -105,7 +101,6 @@ .ugb-modal-design-library__filters { overflow-y: auto; padding: 24px; - height: 100%; } /** From 19d11553799f0e566b9ceea570f617103ae2c290 Mon Sep 17 00:00:00 2001 From: prconcepcion Date: Mon, 7 Aug 2023 17:34:46 +0800 Subject: [PATCH 5/6] added styles to prevent moda; from having unwanted srolling behaviour --- src/components/modal-design-library/editor.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss index c1c393aa7..e10b09e89 100644 --- a/src/components/modal-design-library/editor.scss +++ b/src/components/modal-design-library/editor.scss @@ -41,6 +41,7 @@ grid-template-columns: 300px auto; grid-template-rows: 80px auto; flex: 1; + height: 100%; } .ugb-modal-design-library__sidebar { box-shadow: 0 0 30px rgba(0, 0, 0, 0.1); @@ -284,3 +285,8 @@ } } } + +// Fix WP 6.3 a div wraps the .ugb-modal-design-library__wrapper +.ugb-modal-design-library .components-modal__content > div:not(.components-modal__header) { + height: 100%; +} From fd55950b7af04ed1fc6a641713553121e8225378 Mon Sep 17 00:00:00 2001 From: Benjamin Intal Date: Mon, 7 Aug 2023 22:14:22 +0800 Subject: [PATCH 6/6] fixed size to 64px and centered no design tip --- src/components/design-library-list/editor.scss | 1 + src/components/modal-design-library/editor.scss | 2 +- src/deprecated/v2/components/modal-design-library/editor.scss | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/design-library-list/editor.scss b/src/components/design-library-list/editor.scss index d979f0ea3..28c05411d 100644 --- a/src/components/design-library-list/editor.scss +++ b/src/components/design-library-list/editor.scss @@ -19,6 +19,7 @@ .components-base-control__help { text-align: center; font-style: italic; + grid-column: 1 / 4; } .ugb-design-library-search__spinner { display: flex; diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss index e10b09e89..78642d957 100644 --- a/src/components/modal-design-library/editor.scss +++ b/src/components/modal-design-library/editor.scss @@ -61,7 +61,7 @@ display: flex; justify-content: flex-end; padding: 0 24px; - height: 50px; + height: 64px; align-items: center; grid-column: 2 / 3; grid-row: 1 / 2; diff --git a/src/deprecated/v2/components/modal-design-library/editor.scss b/src/deprecated/v2/components/modal-design-library/editor.scss index 0b8437b5e..1a0af2ea8 100644 --- a/src/deprecated/v2/components/modal-design-library/editor.scss +++ b/src/deprecated/v2/components/modal-design-library/editor.scss @@ -43,7 +43,7 @@ display: flex; justify-content: flex-end; padding: 0 24px; - height: 50px; + height: 64px; align-items: center; grid-column: 2 / 3; grid-row: 1 / 2;