diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5766181471..c388f33600 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -399,72 +399,72 @@ span { background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-repeat: repeat-y; } -/* line 29, ../sass/_fixed-position.scss */ +/* line 28, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item { position: absolute; border: 1px solid transparent; } - /* line 33, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-item > div { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - background-color: rgba(255, 0, 0, 0.2); } - /* line 37, ../sass/_fixed-position.scss */ + /* line 32, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item.s-selected { -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; border-color: #0099cc; cursor: move; } - /* line 42, ../sass/_fixed-position.scss */ + /* line 37, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item.s-not-selected { opacity: 0.8; } -/* line 47, ../sass/_fixed-position.scss */ -.t-fixed-position .l-fixed-position-image { - width: 100%; - height: 100%; - background-size: contain; - background-repeat: no-repeat; - background-position: left top; } -/* line 55, ../sass/_fixed-position.scss */ -.t-fixed-position .l-fixed-position-text { - border: 1px solid transparent; - height: 100%; - width: 100%; - font-size: 0.8rem; } - /* line 60, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-text.l-static-text { - overflow: auto; - padding: 3px; } - /* line 65, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-text.l-telemetry .l-elem { - overflow: hidden; - position: absolute; - top: 3px; - right: 3px; - bottom: 3px; - left: 3px; - width: auto; - height: auto; + /* line 43, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-box, + .t-fixed-position .l-fixed-position-item .l-fixed-position-image, + .t-fixed-position .l-fixed-position-item .l-fixed-position-text { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - width: 50%; } - /* line 69, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-title { - right: auto; - left: 3px; } - /* line 73, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-value { + height: 100%; + width: 100%; } + /* line 51, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-image { + background-size: contain; + background-repeat: no-repeat; + background-position: left top; } + /* line 57, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text { + text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; + border: 1px solid transparent; + font-size: 0.8rem; } + /* line 62, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { + overflow: auto; + padding: 3px; } + /* line 67, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { + overflow: hidden; + position: absolute; + top: 3px; right: 3px; - left: auto; - text-align: right; } - /* line 77, ../sass/_fixed-position.scss */ - .t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { - background-color: rgba(255, 204, 0, 0.2); - left: 3px; - width: 100%; } -/* line 87, ../sass/_fixed-position.scss */ + bottom: 3px; + left: 3px; + width: auto; + height: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + width: 50%; } + /* line 71, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { + right: auto; + left: 3px; } + /* line 75, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { + right: 3px; + left: auto; + text-align: right; } + /* line 79, ../sass/_fixed-position.scss */ + .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { + background-color: rgba(255, 204, 0, 0.2); + left: 3px; + width: 100%; } +/* line 90, ../sass/_fixed-position.scss */ .t-fixed-position .l-fixed-position-item-handle { background: rgba(0, 153, 204, 0.5); cursor: crosshair; diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 7b72ee993c..61d1300e93 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -21,7 +21,6 @@ &.l-grid-y { @include bgTicks($colorGridLines, 'y'); } - } } } @@ -29,11 +28,7 @@ .l-fixed-position-item { position: absolute; border: 1px solid transparent; -// @include box-sizing(border-box); - &>div { - @include box-sizing(border-box); - @include test(red); - } + &.s-selected { @include boxShdwLarge(); border-color: $colorKey; @@ -42,59 +37,64 @@ &.s-not-selected { opacity: 0.8; } - } - .l-fixed-position-image { - width: 100%; - height: 100%; - background-size: contain; - background-repeat: no-repeat; - background-position: left top; - } - - .l-fixed-position-text { - border:1px solid transparent; - height: 100%; width: 100%; - font-size: 0.8rem; - $p: $interiorMarginSm; - &.l-static-text { - overflow: auto; - padding: $p; + .l-fixed-position-box, + .l-fixed-position-image, + .l-fixed-position-text { + @include box-sizing(border-box); + height: 100%; width: 100%; } - &.l-telemetry { - .l-elem { - @include absPosDefault($p); - @include box-sizing(border-box); - width: 50%; - &.l-title { - right: auto; - left: $p; - } - &.l-value { - right: $p; - left: auto; - text-align: right; - &.telem-only { - @include test(); + + .l-fixed-position-box { + } + + .l-fixed-position-image { + background-size: contain; + background-repeat: no-repeat; + background-position: left top; + } + + .l-fixed-position-text { + @include txtShdwSubtle(); + border:1px solid transparent; + font-size: 0.8rem; + $p: $interiorMarginSm; + &.l-static-text { + overflow: auto; + padding: $p; + } + &.l-telemetry { + .l-elem { + @include absPosDefault($p); + @include box-sizing(border-box); + width: 50%; + &.l-title { + right: auto; left: $p; - width: 100%; + } + &.l-value { + right: $p; + left: auto; + text-align: right; + &.telem-only { + @include test(); + left: $p; + width: 100%; + } } } } } } - + .l-fixed-position-item-handle { $brd: 1px solid $colorKey; -// @include border-radius($controlCr); + // @include border-radius($controlCr); background: rgba($colorKey, 0.5); cursor: crosshair; border: $brd; position: absolute; } - - - } .edit-mode .t-fixed-position { diff --git a/platform/features/layout/res/templates/elements/box.html b/platform/features/layout/res/templates/elements/box.html index 3ca8eef7da..f8034129e4 100644 --- a/platform/features/layout/res/templates/elements/box.html +++ b/platform/features/layout/res/templates/elements/box.html @@ -1,3 +1,5 @@ -