Merge pull request #1062 from ironmansoftware/DefaultThemeFixes

Sidenav, Float Button, Tabs Default Color Correct + Padding to Defaul…
ironmansoftware · Aug 29, 2019 · 750dd6c · 750dd6c
2 parents cfc270b + 2c545f2
commit 750dd6c
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 14 deletions.
diff --git a/src/UniversalDashboard/Themes/DarkDefault.psd1 b/src/UniversalDashboard/Themes/DarkDefault.psd1
@@ -44,6 +44,13 @@
             FontColor = "#FFFFFF"
         }
 
+        'main' = @{
+            'padding-left' = "50px"
+            'padding-right' = "50px"
+            'padding-top' = "50px"
+            'padding-bottom' = "50px"
+        }
+
         'p' = @{
             'color' = '#FFFFFF !important'
         }

diff --git a/src/UniversalDashboard/Themes/Default.psd1 b/src/UniversalDashboard/Themes/Default.psd1
@@ -15,43 +15,96 @@
             BackgroundColor = "#3f51b5"
             FontColor = "#ffffff"
         }
-
+
+        'main' = @{
+            'padding-left' = "50px"
+            'padding-right' = "50px"
+            'padding-top' = "50px"
+            'padding-bottom' = "50px"
+        }
+
         '.btn' = @{
             'background-color' = "#3f51b5"
         }
-
+    
         '.btn:hover' = @{
             'background-color' = "#2c387e"
         }
-
+    
         '.btn-floating' = @{
             'background-color' = "#3f51b5"
         }
-
-        'main' = @{
-            'padding-left' = "50px"
-            'padding-right' = "50px"
-            'padding-top' = "50px"
-            'padding-bottom' = "50px"
+
+        '.btn-floating:hover' = @{
+            'background-color' = "#2c387e"
         }
-
+
+        '.btn-floating:focus, .btn-large:focus, .btn-small:focus, .btn:focus' = @{
+            'background-color' = "#2c387e"
+        }
+
         '[type="radio"]:checked + span::after' = @{
             'background-color' = "#3f51b5"
         }
-
+    
         '[type="checkbox"]:checked + span:not(.lever)::before' = @{
             "border-right" = "2px solid #3f51b5"
             "border-bottom" = "2px solid #3f51b5"
         }
-
-        '.pagination li a'= @{
+    
+        '.pagination li a' = @{
             'color' = "#3f51b5"
         }
-
+    
         '.pagination li.active' = @{
             'color' = "#111111 !important"
             'background-color' = "#3f51b5"
         }
+
+        '.tabs' = @{
+            'color'= "#3f51b5"
+
+        }
+        '.tabs .tab' = @{
+            'color' = "#3f51b5"
+        }
+
+        '.tabs .tab a:hover' = @{
+            'background-color' = "#3f51b5"
+            'color'= "#ffffff"
+        }
+
+        '.tabs .tab a.active' = @{
+            'background-color' = "#3f51b5"
+            'color'= "#ffffff"
+        }
+
+        '.tabs .tab a:focus.active' = @{
+            'background-color' = "#3f51b5"
+            'color'= "#ffffff"
+        }
+
+        '.tabs .indicator' = @{
+            'background-color' = "#2c387e"
+        }
+
+        '.tabs .tab a' = @{
+            'color' = "#3f51b5"
+        }
+
+        '.sidenav a:hover' = @{
+            'background-color' = "#3f51b5"
+            'color'= "#FFFFFF"
+        }
+
+        '.sidenav li>a' = @{
+            'color' = "#111111"
+        }
+
+        '.sidenav li>a:hover' = @{
+            'background-color' = "#3f51b5"
+        }
+
 
     }
 }