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

Merge open155 > github/master

Browse Source 
open155
open186
Trying a third time to resolve conflicts between open155 and master;
This commit is contained in:
Charles Hacskaylo
2015-10-30 16:20:57 -07:00
parent ec56fe7bfd
commit 1e6731e6f2
52 changed files with 5594 additions and 3151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/commonUI/themes/snow/res/sass/_constants.scss
View File

@@ -72,6 +72,20 @@ $colorInputBg: $colorGenBg;
$colorInputFg: $colorBodyFg;
$colorFormText: pushBack($colorBodyFg, 10%);
$colorInputIcon: pushBack($colorBodyFg, 25%);
// Status colors, mainly used for messaging and item ancillary symbols
$colorStatusFg: #fff;
$colorStatusDefault: #ccc;
$colorStatusInfo: #60ba7b;
$colorStatusAlert: #ffb66c;
$colorStatusError: #c96b68;
$colorProgressBarOuter: rgba(#000, 0.1);
$colorProgressBarAmt: #0a0;
$progressBarHOverlay: 15px;
$progressBarStripeW: 20px;
$shdwStatusIc: rgba(white, 0.8) 0 0px 5px;
// Selects
$colorSelectBg: #ddd;
$colorSelectFg: $colorBodyFg;