Merge branch 'master' into display-layout/grid-fix

2020-10-23 09:38:27 -07:00 · 2020-10-23 09:28:28 -07:00 · 2020-10-02 10:02:16 -07:00 · 2020-09-14 11:05:29 -07:00 · 2020-08-27 11:42:45 -07:00 · 2020-08-27 10:34:28 -07:00
1 changed files with 2 additions and 2 deletions
--- a/src/plugins/displayLayout/components/display-layout.scss
+++ b/src/plugins/displayLayout/components/display-layout.scss
@@ -42,10 +42,10 @@
    }

    .l-layout__frame {
-        &[s-selected],
+        &[s-selected]:not([multi-select="true"]),
        &[s-selected-parent] {
            // Display grid and allow edit marquee to display in nested layouts when editing
-            > * > * > .l-layout + .allow-editing {
+            > * > * > .l-layout.allow-editing {
                box-shadow: inset $editUIGridColorFg 0 0 2px 1px;

                > [class*='grid-holder'] {
Author	SHA1	Message	Date
David Tsay	44d73305a4	Merge branch 'master' into display-layout/grid-fix	2020-10-23 09:38:27 -07:00
David Tsay	0bccbfde95	Merge branch 'master' into display-layout/grid-fix	2020-10-23 09:28:28 -07:00
David Tsay	8f9ef012bc	Merge branch 'master' into display-layout/grid-fix	2020-10-02 10:02:16 -07:00
David Tsay	8ab1de85a0	Merge branch 'master' into display-layout/grid-fix	2020-09-14 11:05:29 -07:00
David Tsay	61f7f970df	hide gridlines for selected layout if is multi selection	2020-08-27 11:42:45 -07:00
David Tsay	56237ca40b	change selector from sibling to same element	2020-08-27 10:34:28 -07:00