Merge pull request ngageoint#867 in WV/opensphere from ~ROYALG/opensphere:THIN-14128 to master

* commit '63965092a7ab135b06a935371a1f8104123d851c':
  feat(theming): fixed colorblind themes when adding an exception theme
  feat(scss): added content fit styling to scale images

Author: gregroyal

scss/os/_utils.scss

@@ -617,6 +617,7 @@ $aspect-ratios: ((16, 9), (4, 3));
   }
 }
 
+
 // --------------------------------- Highlight Style -----------------------------------//
 .u-highlight-text {
   @include bg-text-variant($yellow);

src/os/config/themesettings.js

@@ -265,10 +265,19 @@ os.config.ThemeSettings.setTheme = function() {
       os.settings.set(os.config.ThemeSettings.Keys.ACCESSIBLE_THEME, accessibleTheme);
     }
 
-    var theme = goog.object.findValue(os.config.ThemeSettings.themeExceptions, function(value, key) {
+    var theme = null;
+    var exceptionTheme = goog.object.findValue(os.config.ThemeSettings.themeExceptions, function(value, key) {
       return window.location.hash.indexOf(key) != -1;
     });
-    if (accessibleTheme && accessibleThemes[displayTheme]) {
+
+    if (exceptionTheme) {
+      if (accessibleTheme && accessibleThemes[exceptionTheme]) {
+        // Get this flavor of the theme
+        theme = accessibleThemes[exceptionTheme][accessibleTheme];
+      } else {
+        theme = accessibleThemes[exceptionTheme]['Normal'];
+      }
+    } else if (accessibleTheme && accessibleThemes[displayTheme]) {
       // Get this flavor of the theme
       theme = accessibleThemes[displayTheme][accessibleTheme];
     }