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

Merge branch 'master' into open1233a

Browse Source
This commit is contained in:
Charles Hacskaylo
2017-04-26 12:24:47 -07:00
committed by GitHub
parent 977aea45b3 fd3312734c
commit 5f8a35ecc0
978 changed files with 3890 additions and 2053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/themes/espresso/bundle.js
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2016, United States Government
* Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*

2
platform/commonUI/themes/espresso/res/sass/_constants.scss
View File

@@ -235,4 +235,4 @@ $colorAboutLink: #84b3ff;
// Loading
$colorLoadingFg: $colorAlt1;
$colorLoadingBg: rgba($colorBodyFg, 0.2);
$colorLoadingBg: rgba($colorBodyFg, 0.2);

2
platform/commonUI/themes/espresso/res/sass/_mixins.scss
View File

@@ -12,4 +12,4 @@
@function pushBack($c: $colorBodyBg, $p: 20%) {
// For dark interfaces, darker things move back - opposite for light interfaces
@return darken($c, $p);
}
}

2
platform/commonUI/themes/espresso/res/sass/theme-espresso.scss
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2016, United States Government
* Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*

2
platform/commonUI/themes/snow/bundle.js
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2016, United States Government
* Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*

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

@@ -235,4 +235,4 @@ $colorAboutLink: #84b3ff;
// Loading
$colorLoadingFg: $colorAlt1;
$colorLoadingBg: rgba($colorLoadingFg, 0.1);
$colorLoadingBg: rgba($colorLoadingFg, 0.1);

2
platform/commonUI/themes/snow/res/sass/_controls.scss
View File

@@ -4,4 +4,4 @@
text-transform: uppercase;
}
}
}
}

2
platform/commonUI/themes/snow/res/sass/_mixins.scss
View File

@@ -11,4 +11,4 @@
@function pushBack($c: $colorBodyBg, $p: 20%) {
// For dark interfaces, darker things move back - opposite for light interfaces
@return lighten($c, $p);
}
}

2
platform/commonUI/themes/snow/res/sass/theme-snow.scss
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2016, United States Government
* Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*