nasa · unlikelyzero · Jan 30, 2024 · Dec 18, 2023 · Dec 19, 2023 · Dec 19, 2023
diff --git a/e2e/avpFixtures.js b/e2e/avpFixtures.js
@@ -60,7 +60,7 @@ exports.scanForA11yViolations = async function (page, testCaseName, options = {}
   const builder = new AxeBuilder({ page });
   builder.withTags(['wcag2aa']);
   // https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-  builder.disableRules(['color-contrast']);
+  //builder.disableRules(['color-contrast']);
   const accessibilityScanResults = await builder.analyze();
 
   // Assert that no violations should be present

diff --git a/src/plugins/folderView/components/grid-view.scss b/src/plugins/folderView/components/grid-view.scss
@@ -118,7 +118,7 @@
 
   &__metadata {
     color: $colorItemFgDetails;
-    font-size: 0.9em;
+    //font-size: 0.9em;
 
     body.mobile & {
       [class*='__item-count'] {

diff --git a/src/plugins/folderView/components/list-item.scss b/src/plugins/folderView/components/list-item.scss
@@ -1,5 +1,7 @@
 /******************************* LIST ITEM */
 .c-list-item {
+  color: $colorItemFgDetails;
+
   &__name__type-icon {
     color: $colorItemTreeIcon;
   }
@@ -8,12 +10,12 @@
     @include ellipsize();
 
     a & {
+      // .c-list-item_name a element
       color: $colorItemFg;
     }
   }
 
   &:not(.c-list-item__name) {
-    color: $colorItemFgDetails;
   }
 
   &.is-alias {

diff --git a/src/plugins/timeConductor/date-picker.scss b/src/plugins/timeConductor/date-picker.scss
@@ -75,7 +75,7 @@
         }
 
         &.selected {
-            background: $colorKey;
+            background: $colorKeyBg;
             color: $colorKeyFg;
         }
     }

diff --git a/src/styles/_constants-espresso.scss b/src/styles/_constants-espresso.scss
@@ -64,20 +64,24 @@ $shdwBtns: rgba(black, 0.2) 0 1px 2px;
 $shdwBtnsOverlay: rgba(black, 0.5) 0 1px 5px;
 
 // Base colors
-$colorBodyBg: #393939;
+$colorBodyBg: #333;
 $colorBodyFg: #aaaaaa;
+$colorBodyFgSubtle: #9c9c9c;
 $colorBodyFgEm: #fff;
 $colorGenBg: #222;
-$colorHeadBg: #262626;
+$colorHeadBg: #000;
 $colorHeadFg: $colorBodyFg;
 $colorKey: #0099cc;
+$colorKeyBg: #007fad; // Darker version of colorKey for use in major buttons
 $colorKeyFg: #fff;
 $colorKeyHov: lighten($colorKey, 10%);
+$colorKeyBgHov: lighten($colorKeyBg, 10%);
 $colorKeyFilter: invert(36%) sepia(76%) saturate(2514%) hue-rotate(170deg) brightness(99%)
   contrast(101%);
 $colorKeyFilterHov: invert(63%) sepia(88%) saturate(3029%) hue-rotate(154deg) brightness(101%)
   contrast(100%);
-$colorKeySelectedBg: $colorKey;
+$colorKeySelectedBg: $colorKeyBg;
+$colorKeySubtle: pushBack($colorKey, 10%);
 $uiColor: #0093ff; // Resize bars, splitter bars, etc.
 $colorInteriorBorder: rgba($colorBodyFg, 0.2);
 $colorA: #ccc;
@@ -142,7 +146,6 @@ $colorPausedFg: #333;
 // Base variations
 $colorBodyBgSubtle: pullForward($colorBodyBg, 5%);
 $colorBodyBgSubtleHov: pullForward($colorBodyBg, 10%);
-$colorKeySubtle: pushBack($colorKey, 10%);
 
 // Time Colors
 $colorTimeCommonFg: #eee;
@@ -237,8 +240,8 @@ $colorBtnFg: pullForward($colorBodyFg, 10%);
 $colorBtnReverseFg: pullForward($colorBtnFg, 10%);
 $colorBtnReverseBg: pullForward($colorBtnBg, 10%);
 $colorBtnFgHov: $colorBtnFg;
-$colorBtnMajorBg: $colorKey;
-$colorBtnMajorBgHov: $colorKeyHov;
+$colorBtnMajorBg: $colorKeyBg;
+$colorBtnMajorBgHov: $colorKeyBgHov;
 $colorBtnMajorFg: $colorKeyFg;
 $colorBtnMajorFgHov: pushBack($colorBtnMajorFg, 10%);
 $colorBtnCautionBg: $colorStatusAlert;
@@ -263,7 +266,7 @@ $shdwCursorGuide: rgba(black, 0.4) 0 0 2px;
 $colorLocalControlOvrBg: rgba($colorBodyBg, 0.8);
 $colorSelectBg: $colorBtnBg; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
 $colorSelectFg: $colorBtnFg;
-$colorSelectArw: lighten($colorBtnBg, 20%);
+$colorSelectArw: #777777; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
 $shdwSelect: rgba(black, 0.5) 0 0.5px 3px;
 $controlDisabledOpacity: 0.2;
 
@@ -316,10 +319,10 @@ $formRowCtrlsH: 14px;
 // Inspector
 $colorInspectorBg: pullForward($colorBodyBg, 5%);
 $colorInspectorFg: $colorBodyFg;
-$colorInspectorPropName: pushBack($colorBodyFg, 20%);
-$colorInspectorPropVal: pullForward($colorInspectorFg, 15%);
+$colorInspectorPropName: $colorBodyFgSubtle;
+$colorInspectorPropVal: $colorBodyFgEm;
 $colorInspectorSectionHeaderBg: pullForward($colorInspectorBg, 5%);
-$colorInspectorSectionHeaderFg: pullForward($colorInspectorBg, 40%);
+$colorInspectorSectionHeaderFg: #bfbfbf;
 
 // Tabs
 $colorTabBg: pullForward($colorBodyBg, 5%);
@@ -366,8 +369,8 @@ $colorLimitCyanFg: #d3faff;
 $colorLimitCyanIc: #6bedff;
 
 // Events
-$colorEventPurpleFg: #6433ff;
-$colorEventRedFg: #cc0000;
+$colorEventPurpleFg: #7d52ff;
+$colorEventRedFg: #f40000;
 $colorEventOrangeFg: orange;
 $colorEventYellowFg: #ffcc00;
 
@@ -383,7 +386,7 @@ $colorItemBgHov: buttonBg(pullForward($colorBtnBg, 5%));
 $colorListItemBg: transparent;
 $colorListItemBgHov: rgba($colorKey, 0.1);
 $colorItemFg: $colorBtnFg;
-$colorItemFgDetails: pushBack($colorItemFg, 20%);
+$colorItemFgDetails: $colorBodyFgSubtle;
 $shdwItemText: none;
 
 // Tabular (NOT TABS!)
@@ -478,9 +481,9 @@ $colorSplitterActive: $colorKey;
 $splitterBtnD: (16px, 35px); // height, width
 $splitterBtnColorBg: $colorBtnBg;
 $splitterBtnColorFg: #999;
-$splitterBtnLabelColorFg: #666;
-$splitterCollapsedBtnColorBg: #222;
-$splitterCollapsedBtnColorFg: #555;
+$splitterBtnLabelColorFg: $colorBodyFgSubtle;
+$splitterCollapsedBtnColorBg: $colorHeadBg;
+$splitterCollapsedBtnColorFg: #777;
 $splitterCollapsedBtnColorBgHov: $colorKey;
 $splitterCollapsedBtnColorFgHov: $colorKeyFg;
 

diff --git a/src/styles/_constants-maelstrom.scss b/src/styles/_constants-maelstrom.scss
@@ -75,8 +75,10 @@ $colorGenBg: #222;
 $colorHeadBg: #262626;
 $colorHeadFg: $colorBodyFg;
 $colorKey: #0099cc;
+$colorKeyBg: #007fad; // Darker version of colorKey for use in major buttons
 $colorKeyFg: #fff;
 $colorKeyHov: #26d8ff;
+$colorKeyBgHov: lighten($colorKeyBg, 10%);
 $colorKeyFilter: invert(36%) sepia(76%) saturate(2514%) hue-rotate(170deg) brightness(99%)
   contrast(101%);
 $colorKeyFilterHov: invert(63%) sepia(88%) saturate(3029%) hue-rotate(154deg) brightness(101%)
@@ -369,8 +371,8 @@ $colorLimitCyanFg: #d3faff;
 $colorLimitCyanIc: #6bedff;
 
 // Events
-$colorEventPurpleFg: #6433ff;
-$colorEventRedFg: #cc0000;
+$colorEventPurpleFg: #7d52ff;
+$colorEventRedFg: #f40000;
 $colorEventOrangeFg: orange;
 $colorEventYellowFg: #ffcc00;
 

diff --git a/src/styles/_constants-snow.scss b/src/styles/_constants-snow.scss
@@ -71,13 +71,16 @@ $colorGenBg: #fff;
 $colorHeadBg: #eee;
 $colorHeadFg: $colorBodyFg;
 $colorKey: #0099cc;
+$colorKeyBg: #007fad; // Darker version of colorKey for use in major buttons
 $colorKeyFg: #fff;
-$colorKeyHov: #00c0f6;
+$colorKeyHov: lighten($colorKey, 10%); //#00c0f6;
+$colorKeyBgHov: lighten($colorKeyBg, 10%);
 $colorKeyFilter: invert(37%) sepia(100%) saturate(686%) hue-rotate(157deg) brightness(102%)
   contrast(102%);
 $colorKeyFilterHov: invert(69%) sepia(87%) saturate(3243%) hue-rotate(151deg) brightness(97%)
   contrast(102%);
 $colorKeySelectedBg: $colorKey;
+$colorKeySubtle: pullForward($colorKey, 10%);
 $uiColor: #289fec; // Resize bars, splitter bars, etc.
 $colorInteriorBorder: rgba($colorBodyFg, 0.2);
 $colorA: $colorBodyFg;
@@ -237,8 +240,8 @@ $colorBtnFg: #fff;
 $colorBtnReverseFg: $colorBodyBg;
 $colorBtnReverseBg: $colorBodyFg;
 $colorBtnFgHov: $colorBtnFg;
-$colorBtnMajorBg: $colorKey;
-$colorBtnMajorBgHov: $colorKeyHov;
+$colorBtnMajorBg: $colorKeyBg;
+$colorBtnMajorBgHov: $colorKeyBgHov;
 $colorBtnMajorFg: $colorKeyFg;
 $colorBtnMajorFgHov: pushBack($colorBtnMajorFg, 10%);
 $colorBtnCautionBg: #f16f6f;

diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss
@@ -343,10 +343,6 @@
         > * + * {
             margin-top: $interiorMarginSm;
         }
-
-        [class*='created-'] {
-            color: pullForward($colorBodyFg, 20%);
-        }
     }
 
     &__time {
@@ -366,6 +362,11 @@
         }
     }
 
+    &__text,
+    &__input {
+        color: $colorBodyFgEm !important;
+    }
+
     &__text {
         min-height: 22px; // Needed in Firefox when field is blank
         white-space: normal;

diff --git a/src/ui/layout/layout.scss b/src/ui/layout/layout.scss
@@ -258,11 +258,8 @@
   &__indicators {
     flex: 1 1 auto;
     flex-wrap: wrap;
+    font-size: 11px;
     justify-content: flex-end;
-
-    .c-indicator .label {
-      font-size: 0.9em;
-    }
   }
 
   /******************************* MAIN AREA */

diff --git a/src/ui/toolbar/components/toolbar-checkbox.scss b/src/ui/toolbar/components/toolbar-checkbox.scss
@@ -25,7 +25,7 @@
     position: absolute;
 
     &:checked + label > .c-custom-checkbox__box {
-      background: $colorKey;
+      background: $colorKeyBg;
       &:before {
         color: $colorKeyFg;
         content: $glyph-icon-check;