diff --git a/src/adapter/vue-adapter/inspector-adapter.js b/src/adapter/vue-adapter/inspector-adapter.js index 9c1b586681..aba93287b4 100644 --- a/src/adapter/vue-adapter/inspector-adapter.js +++ b/src/adapter/vue-adapter/inspector-adapter.js @@ -27,7 +27,7 @@ define([ this.templateLinker.link( this.scope, - angular.element(layout.$refs.inspector.$refs.properties.$el), + angular.element(layout.$refs.inspector.$refs.properties), this.templateMap["inspectorRegion"] ); this.$timeout(function () { diff --git a/src/styles-new/_constants-snow.scss b/src/styles-new/_constants-snow.scss index 3569665b0d..95f6606ea9 100644 --- a/src/styles-new/_constants-snow.scss +++ b/src/styles-new/_constants-snow.scss @@ -30,9 +30,10 @@ $colorAHov: $colorKey; $contrastRatioPercent: 40%; $hoverRatioPercent: 10%; $basicCr: 4px; -$controlCr: $basicCr; -$smallCr: 3px; +$controlCr: 3px; +$smallCr: 2px; $overlayCr: 11px; +$shdwTextSubtle: rgba(black, 0.2) 0 1px 2px; // Buttons and Controls $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); diff --git a/src/styles-new/_mixins.scss b/src/styles-new/_mixins.scss index a1575f3d1b..91c7d86224 100644 --- a/src/styles-new/_mixins.scss +++ b/src/styles-new/_mixins.scss @@ -113,4 +113,16 @@ @function decimalToPercent($d) { @return percentage($d); +} + +/************************** UTILITIES */ +@mixin browserPrefix($prop, $val) { + #{$prop}: $val; + -ms-#{$prop}: $val; + -moz-#{$prop}: $val; + -webkit-#{$prop}: $val; +} + +@mixin userSelectNone() { + @include browserPrefix(user-select, none); } \ No newline at end of file diff --git a/src/ui/components/controls/pane.vue b/src/ui/components/controls/pane.vue index 8fcc2d8b1d..8ebb05891e 100644 --- a/src/ui/components/controls/pane.vue +++ b/src/ui/components/controls/pane.vue @@ -5,16 +5,17 @@ 'l-pane--horizontal-handle-after': type === 'horizontal' && handle === 'after', 'l-pane--vertical-handle-before': type === 'vertical' && handle === 'before', 'l-pane--vertical-handle-after': type === 'vertical' && handle === 'after', - 'l-pane--collapsed': collapsed + 'l-pane--collapsed': collapsed, + 'l-pane--resizing': resizing === true }">