Merge pull request #1452 from ironmansoftware/282tabfonthemeadjustments

Font, Tab Color Changes to Theme
ironmansoftware · Jan 17, 2020 · f9afef4 · f9afef4
2 parents 5f9d2ea + de536a3
commit f9afef4
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added support for Set-UDElement, Remove-UDElement and Clear-UDElement events on New-UDCheckbox (#1368) by [BoSen29](https://github.com/BoSen29)
 - Added support for UDTab load data when his the active tab (#1392, #1169) by [alongvili](https://github.com/alongvili)
-
+- Allow Specification of Font in Themes
 
 ### Added (Enterprise)
 ### Changed
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix New-CarouselItem URL parameter not functioning (#1417) by [alongvili](https://github.com/alongvili)
 - Fix UDMUChip -OnDelete parameter not working (#1423) by [alongvili](https://github.com/alongvili)
 - Connection management now uses a ConcurrentDictionary rather than locks by [adamdriscoll](https://github.com/adamdriscoll)
-
+- Changed Active Tab Color and Font Slightly to be more uniform with rest of dashboard
 
 ### Changed (Enterprise)
 

diff --git a/src/UniversalDashboard/Services/ThemeService.cs b/src/UniversalDashboard/Services/ThemeService.cs
@@ -248,6 +248,7 @@ static ThemeService()
 
             // Properties
             _cssMap.Add("backgroundcolor", ToClasses("background-color"));
+            _cssMap.Add("fontfamily", ToClasses("font-family"));
             _cssMap.Add("fontcolor", ToClasses("color"));
             _cssMap.Add("activefontcolor", ToClasses("color"));
             _cssMap.Add("activebackgroundcolor", ToClasses("background-color"));

diff --git a/src/UniversalDashboard/Themes/DarkDefault.psd1 b/src/UniversalDashboard/Themes/DarkDefault.psd1
@@ -3,6 +3,7 @@
 
 $FontColorDark = "#FFFFFF"
 $FontColorLight = "#FFFFFF"
+$FontFamily = '"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif'
 
 $BackgroundColorPrimary = "#393F47"
 $BackgroundColorLighter = "#252525"
@@ -11,6 +12,7 @@ $BackgroundColorBright = "#272C33"
 
 $PrimaryColor = "#272C33"
 $PrimaryColorDark = "#272C33"
+$PrimaryColorLight = "#404040"
 
 $PrimaryFontColor = $FontColorDark
 $AlternateFontColor = $FontColorLight
@@ -26,7 +28,8 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
         #UD ELEMENTS
         UDDashboard = @{
             BackgroundColor = $PrimaryBackgroundColor
-            FontColor = $PrimaryFontColor 
+            FontColor = $PrimaryFontColor
+            $FontFamily = $FontFamily
         }
 
         UDNavBar = @{
@@ -74,6 +77,49 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
             BackgroundColor = $AlternativeBackgroundColor3
             FontColor = $PrimaryFontColor 
         }
+
+        UDTabs = @{
+            BackgroundColor = $AlternativeBackgroundColor3
+            Height = 'auto'
+            BoxShadow = 'unset'
+            FontFamily = $FontFamily
+
+        }
+
+        UDTab = @{
+            FontColor = $PrimaryColor
+            FontFamily = $FontFamily
+            # No need for backgroundColor it inherit UDTabs backgroundColor
+        }
+
+        UDTabActive = @{
+            ActiveFontColor = $AlternateFontColor
+            ActiveBackgroundColor = $PrimaryColor
+        }
+
+        UDTabIcon = @{
+            FontColor = $PrimaryColor
+            Height = 'auto'
+            LineHeight = 'inherit'
+        }
+
+        UDTabActiveIcon = @{
+            ActiveFontColor = $AlternateFontColor
+        }
+
+        UDTabIndicator = @{
+            IndicatorColor = $PrimaryColorDark
+        }
+
+        UDImageCarouselIndicator = @{
+            Width = '10px'
+            Height = '10px'
+        }
+
+        UDImageCarouselIndicatorActive = @{
+            BackgroundColor = $PrimaryColor
+        }
+
 
         #CSS ELEMENTS
         'main' = @{

diff --git a/src/UniversalDashboard/Themes/Default.psd1 b/src/UniversalDashboard/Themes/Default.psd1
@@ -3,6 +3,7 @@
 
 $FontColorDark = "#111111"
 $FontColorLight = "#FFFFFF"
+$FontFamily = '"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif'
 
 $BackgroundColorPrimary = "#EEEEEE"
 $BackgroundColorLighter = "#FAFAFA"
@@ -30,7 +31,8 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
         #UD ELEMENTS
         UDDashboard                            = @{
             BackgroundColor = $PrimaryBackgroundColor
-            FontColor       = $PrimaryFontColor 
+            FontColor       = $PrimaryFontColor
+            FontFamily = $FontFamily
         }
 
         UDNavBar                               = @{
@@ -83,12 +85,13 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
             BackgroundColor = $AlternativeBackgroundColor3
             Height = 'auto'
             BoxShadow = 'unset'
+            FontFamily = $FontFamily
 
         }
 
-
         UDTab = @{
             FontColor = $PrimaryColor
+            FontFamily = $FontFamily
             # No need for backgroundColor it inherit UDTabs backgroundColor
         }
 
@@ -108,7 +111,7 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
         }
 
         UDTabIndicator = @{
-            IndicatorColor = $SecondaryColor
+            IndicatorColor = $PrimaryColorDark
         }
 
         UDImageCarouselIndicator = @{

diff --git a/src/UniversalDashboard/Themes/DefaultTight.psd1 b/src/UniversalDashboard/Themes/DefaultTight.psd1
@@ -3,6 +3,7 @@
 
 $FontColorDark = "#111111"
 $FontColorLight = "#FFFFFF"
+$FontFamily = '"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif'
 
 $BackgroundColorPrimary = "#EEEEEE"
 $BackgroundColorLighter = "#FAFAFA"
@@ -30,6 +31,7 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
         UDDashboard = @{
             BackgroundColor = $PrimaryBackgroundColor
             FontColor = $PrimaryFontColor 
+            $FontFamily = $FontFamily
         }
 
         UDNavBar = @{
@@ -89,6 +91,48 @@ $AlternativeBackgroundColor3 = $BackgroundColorBright
             BackgroundColor = $AlternativeBackgroundColor3
             FontColor = $PrimaryFontColor 
         }
+
+        UDTabs = @{
+            BackgroundColor = $AlternativeBackgroundColor3
+            Height = 'auto'
+            BoxShadow = 'unset'
+            FontFamily = $FontFamily
+
+        }
+
+        UDTab = @{
+            FontColor = $PrimaryColor
+            FontFamily = $FontFamily
+            # No need for backgroundColor it inherit UDTabs backgroundColor
+        }
+
+        UDTabActive = @{
+            ActiveFontColor = $AlternateFontColor
+            ActiveBackgroundColor = $PrimaryColor
+        }
+
+        UDTabIcon = @{
+            FontColor = $PrimaryColor
+            Height = 'auto'
+            LineHeight = 'inherit'
+        }
+
+        UDTabActiveIcon = @{
+            ActiveFontColor = $AlternateFontColor
+        }
+
+        UDTabIndicator = @{
+            IndicatorColor = $PrimaryColorDark
+        }
+
+        UDImageCarouselIndicator = @{
+            Width = '10px'
+            Height = '10px'
+        }
+
+        UDImageCarouselIndicatorActive = @{
+            BackgroundColor = $PrimaryColor
+        }
 
         #CSS ELEMENTS
         'main' = @{