From 93b0720dc16ea2cbedd6db97ef737ad8ce371f3b Mon Sep 17 00:00:00 2001 From: Greg Royal Date: Tue, 13 Aug 2019 07:54:21 -0600 Subject: [PATCH 1/2] feat(scss): added content fit styling to scale images --- scss/os/_utils.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/os/_utils.scss b/scss/os/_utils.scss index a931cd5a3..d663f4091 100644 --- a/scss/os/_utils.scss +++ b/scss/os/_utils.scss @@ -617,6 +617,7 @@ $aspect-ratios: ((16, 9), (4, 3)); } } + // --------------------------------- Highlight Style -----------------------------------// .u-highlight-text { @include bg-text-variant($yellow); From 63965092a7ab135b06a935371a1f8104123d851c Mon Sep 17 00:00:00 2001 From: Greg Royal Date: Mon, 19 Aug 2019 13:55:44 -0600 Subject: [PATCH 2/2] feat(theming): fixed colorblind themes when adding an exception theme --- src/os/config/themesettings.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/os/config/themesettings.js b/src/os/config/themesettings.js index 3d9639a8d..0952b4508 100644 --- a/src/os/config/themesettings.js +++ b/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]; }