From 7d0d2d5453efb1a62f1d2763a9ea4f4e01402ce2 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 8 Sep 2020 18:38:47 +0100 Subject: [PATCH 1/3] Fixing an issue where the buttons for the components hierarchy were overflowing outside of their parent panel, removing the specification of the width and height allows computed values to be used instead (including padding etc) - check this fixes it in windows, linux and electron app. --- .../src/components/userInterface/ComponentsHierarchy.svelte | 2 -- .../components/userInterface/ComponentsHierarchyChildren.svelte | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte index feb44433fe..d688674544 100644 --- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte +++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte @@ -109,8 +109,6 @@ .dropdown-menu { display: none; - height: 24px; - width: 24px; color: var(--ink); padding: 0px 5px; border-style: none; diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte index dee45c7c11..b9bd5c4cbc 100644 --- a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte +++ b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte @@ -204,8 +204,6 @@ .actions { display: none; - height: 24px; - width: 24px; color: var(--ink); padding: 0px 5px; border-style: none; From 2b11a9df38d8ea8389f5d8a0a49d9bbf0741f09b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 9 Sep 2020 09:44:24 +0100 Subject: [PATCH 2/3] Fixing component button styles, making all component dropdown menus buttons have the correct styling across the board. --- .../userInterface/ComponentDropdownMenu.svelte | 10 ++++++++++ .../userInterface/ComponentsHierarchy.svelte | 4 +++- .../userInterface/ComponentsHierarchyChildren.svelte | 4 +++- .../components/userInterface/ScreenDropdownMenu.svelte | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte index 1c2f1d58cc..581bee5ef0 100644 --- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte @@ -195,6 +195,16 @@ cursor: pointer; } + button { + border-style: none; + border-radius: 2px; + padding: 0; + background: transparent; + cursor: pointer; + color: var(--ink); + outline: none; + } + li:hover { background-color: var(--grey-2); } diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte index d688674544..b907a2dbca 100644 --- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte +++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte @@ -110,7 +110,9 @@ .dropdown-menu { display: none; color: var(--ink); - padding: 0px 5px; + padding: 0 5px; + width: 24px; + height: 24px; border-style: none; background: rgba(0, 0, 0, 0); cursor: pointer; diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte index b9bd5c4cbc..d9c619fae3 100644 --- a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte +++ b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte @@ -205,7 +205,9 @@ .actions { display: none; color: var(--ink); - padding: 0px 5px; + padding: 0 5px; + width: 24px; + height: 24px; border-style: none; background: rgba(0, 0, 0, 0); cursor: pointer; diff --git a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte index 7c32f03a6f..111336bcfe 100644 --- a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte @@ -64,7 +64,7 @@ .root button { border-style: none; border-radius: 2px; - padding: 5px; + padding: 0; background: transparent; cursor: pointer; color: var(--ink); From ab2303ed0cbaa9d092b795ca28ea819263af58c4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Sep 2020 09:56:20 +0100 Subject: [PATCH 3/3] Add Andrew Kingston and Michael Drury to authors --- AUTHORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index 3fe249cbc7..28e8898524 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,3 +5,5 @@ Contributors * Daniel Loudon - [@danbudi](https://github.com/marblekirby) * Joe - [@joebudi](https://github.com/joebudi) * Martin McKeaveney - [@shogunpurple](https://github.com/shogunpurple) +* Andrew Kingston - [@aptkingston](https://github.com/aptkingston) +* Michael Drury - [@mike12345567](https://github.com/mike12345567) \ No newline at end of file