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

[Frontend] Mods to DialogService model and dialogs

Browse Source 
open #159
open #170
Properly re-cast model.hint and added model.actionText;
Moved progressText into progress-bar.html;
Tweaks to dialog styles;
Tweaked styles for progress bar;
Normalized various dialog templates markup;
This commit is contained in:
Charles Hacskaylo
2015-10-07 11:45:08 -07:00
parent 6840e596a5
commit ad4292f1e9
12 changed files with 186 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@@ -329,16 +329,19 @@ label.checkbox.custom {
&:not(.indeterminate) {
.progress-amt:before {
// Slower, more subtle anim for determinate progress
@include animation(progress .3s linear infinite);
@include bgProgressAnim(#fff, 0.2, $progressBarStripeW);
// More subtle anim for determinate progress
@include animation(progress .4s linear infinite);
@include bgProgressAnim(#fff, 0.1, $progressBarStripeW);
}
}
&.indeterminate .progress-amt:before {
// Faster, more visible anim for indeterminate progress
@include animation(progress .6s linear infinite);
@include bgProgressAnim(#fff, 0.4, $progressBarStripeW);
&.indeterminate .progress-amt {
&:before {
// More visible std diag stripe anim for indeterminate progress
@include animation(progress .6s linear infinite);
@include bgDiagonalStripes(#fff, 0.2, $progressBarStripeW);
}
&:after { display: none; }
}
}

6
platform/commonUI/general/res/sass/controls/_messages.scss
View File

@@ -107,12 +107,9 @@
padding: 0 $interiorMargin 0 $interiorMargin;
@include transform(translateX(-50%));
a, span {
.banner-elem {
@include flex(0 1 auto);
margin-left: $interiorMargin;
&:first-child {
//margin-left: 0;
}
}
a {
display: inline-block;
@@ -133,6 +130,7 @@
line-height: $h;
width: 100px;
}
.progress-info.progress-estimate { display: none; }
z-index: 2;
}

4
platform/commonUI/general/res/sass/overlay/_overlay.scss
View File

@@ -48,6 +48,10 @@
line-height: 120%;
margin-bottom: $interiorMargin;
}
.hint {
color: pushBack($colorOvrFg, 20%);
}
.top-bar {
height: $ovrTopBarH;