alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Frontend] Delivery checkin: final tweaks to CSS

Browse Source 
WTD-894
CSS tweaks to allow box-sizing to be applied to elements within mct-include containers;
CSS cleanups
This commit is contained in:
Charles Hacskaylo
2015-02-25 18:41:00 -08:00
parent a0f31132e3
commit 424d60440c
3 changed files with 99 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
platform/commonUI/general/res/css/theme-espresso.css
View File

@@ -399,45 +399,45 @@ span {
background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); 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-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-repeat: repeat-y; } background-repeat: repeat-y; }
/* line 29, ../sass/_fixed-position.scss */ /* line 28, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item { .t-fixed-position .l-fixed-position-item {
position: absolute; position: absolute;
border: 1px solid transparent; } border: 1px solid transparent; }
/* line 33, ../sass/_fixed-position.scss */ /* line 32, ../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 */
.t-fixed-position .l-fixed-position-item.s-selected { .t-fixed-position .l-fixed-position-item.s-selected {
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
-moz-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; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
border-color: #0099cc; border-color: #0099cc;
cursor: move; } cursor: move; }
/* line 42, ../sass/_fixed-position.scss */ /* line 37, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-not-selected { .t-fixed-position .l-fixed-position-item.s-not-selected {
opacity: 0.8; } opacity: 0.8; }
/* line 47, ../sass/_fixed-position.scss */ /* line 43, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-image { .t-fixed-position .l-fixed-position-item .l-fixed-position-box,
width: 100%; .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;
height: 100%; 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-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left top; } background-position: left top; }
/* line 55, ../sass/_fixed-position.scss */ /* line 57, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text { .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; border: 1px solid transparent;
height: 100%;
width: 100%;
font-size: 0.8rem; } font-size: 0.8rem; }
/* line 60, ../sass/_fixed-position.scss */ /* line 62, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text.l-static-text { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text {
overflow: auto; overflow: auto;
padding: 3px; } padding: 3px; }
/* line 65, ../sass/_fixed-position.scss */ /* line 67, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text.l-telemetry .l-elem { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem {
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
top: 3px; top: 3px;
@@ -450,21 +450,21 @@ span {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
width: 50%; } width: 50%; }
/* line 69, ../sass/_fixed-position.scss */ /* line 71, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-title { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title {
right: auto; right: auto;
left: 3px; } left: 3px; }
/* line 73, ../sass/_fixed-position.scss */ /* line 75, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-value { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
right: 3px; right: 3px;
left: auto; left: auto;
text-align: right; } text-align: right; }
/* line 77, ../sass/_fixed-position.scss */ /* line 79, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { .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); background-color: rgba(255, 204, 0, 0.2);
left: 3px; left: 3px;
width: 100%; } width: 100%; }
/* line 87, ../sass/_fixed-position.scss */ /* line 90, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item-handle { .t-fixed-position .l-fixed-position-item-handle {
background: rgba(0, 153, 204, 0.5); background: rgba(0, 153, 204, 0.5);
cursor: crosshair; cursor: crosshair;

26
platform/commonUI/general/res/sass/_fixed-position.scss
View File

@@ -21,7 +21,6 @@
&.l-grid-y { &.l-grid-y {
@include bgTicks($colorGridLines, 'y'); @include bgTicks($colorGridLines, 'y');
} }
} }
} }
} }
@@ -29,11 +28,7 @@
.l-fixed-position-item { .l-fixed-position-item {
position: absolute; position: absolute;
border: 1px solid transparent; border: 1px solid transparent;
// @include box-sizing(border-box);
&>div {
@include box-sizing(border-box);
@include test(red);
}
&.s-selected { &.s-selected {
@include boxShdwLarge(); @include boxShdwLarge();
border-color: $colorKey; border-color: $colorKey;
@@ -42,19 +37,26 @@
&.s-not-selected { &.s-not-selected {
opacity: 0.8; opacity: 0.8;
} }
.l-fixed-position-box,
.l-fixed-position-image,
.l-fixed-position-text {
@include box-sizing(border-box);
height: 100%; width: 100%;
}
.l-fixed-position-box {
} }
.l-fixed-position-image { .l-fixed-position-image {
width: 100%;
height: 100%;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left top; background-position: left top;
} }
.l-fixed-position-text { .l-fixed-position-text {
@include txtShdwSubtle();
border:1px solid transparent; border:1px solid transparent;
height: 100%; width: 100%;
font-size: 0.8rem; font-size: 0.8rem;
$p: $interiorMarginSm; $p: $interiorMarginSm;
&.l-static-text { &.l-static-text {
@@ -83,18 +85,16 @@
} }
} }
} }
}
.l-fixed-position-item-handle { .l-fixed-position-item-handle {
$brd: 1px solid $colorKey; $brd: 1px solid $colorKey;
// @include border-radius($controlCr); // @include border-radius($controlCr);
background: rgba($colorKey, 0.5); background: rgba($colorKey, 0.5);
cursor: crosshair; cursor: crosshair;
border: $brd; border: $brd;
position: absolute; position: absolute;
} }
} }
.edit-mode .t-fixed-position { .edit-mode .t-fixed-position {

6
platform/features/layout/res/templates/elements/box.html
View File

@@ -1,3 +1,5 @@
<div ng-style="{ background: ngModel.fill(), border: '1px ' + ngModel.stroke() + ' solid' }" <div
style="width: 100%; height: 100%;"> class="l-fixed-position-box"
ng-style="{ background: ngModel.fill(), border: '1px ' + ngModel.stroke() + ' solid' }"
>
</div> </div>