Merge pull request #1858 from flant/light-dark-theme

feat: Change default themes to light/dark

server/templates.go

@@ -79,8 +79,12 @@ func dirExists(dir string) error {
 //    |- templates
 //
 func loadWebConfig(c webConfig) (http.Handler, http.Handler, *templates, error) {
+	// fallback to the default theme if the legacy theme name is provided
+	if c.theme == "coreos" || c.theme == "tectonic" {
+		c.theme = ""
+	}
 	if c.theme == "" {
-		c.theme = "coreos"
+		c.theme = "light"
 	}
 	if c.issuer == "" {
 		c.issuer = "dex"

web/static/main.css

@@ -53,22 +53,19 @@ body {
   background-image: url(../static/img/email-icon.svg);
 }
 
-.dex-btn-icon--coreos {
-  /* B&W CoreOS SVG logo */
-  background-image: url(../static/img/coreos-icon.svg);
-}
-
 .dex-btn-icon--github {
   background-color: #F5F5F5;
   background-image: url(../static/img/github-icon.svg);
 }
 
 .dex-btn-icon--gitlab {
+  background-color: #F5F5F5;
   background-image: url(../static/img/gitlab-icon.svg);
   background-size: contain;
 }
 
 .dex-btn-icon--oidc {
+  background-color: #EBEBEE;
   background-image: url(../static/img/oidc-icon.svg);
   background-size: contain;
 }

web/themes/tectonic/styles.css → web/themes/dark/styles.css

@@ -1,11 +1,18 @@
 .theme-body {
-  background-color: #1C425B;
-  color: #333;
+  background-color: #0f1218;
+  color: #c8d1d9;
   font-family: 'Source Sans Pro', Helvetica, sans-serif;
 }
 
 .theme-navbar {
-  display: none;
+  background-color: #161b22;
+  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+  color: #161B2B;
+  font-size: 13px;
+  font-weight: 100;
+  height: 46px;
+  overflow: hidden;
+  padding: 0 10px;
 }
 
 .theme-navbar__logo-wrap {
@@ -24,47 +31,49 @@
 .theme-heading {
   font-size: 20px;
   font-weight: 500;
-  padding-bottom: 10px;
   margin-top: 0;
+  color: #c8d1d9;
 }
 
 .theme-panel {
-  background-color: #fff;
+  background-color: #161b22;
   box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   padding: 30px;
 }
 
 .theme-btn-provider {
-  background-color: #fff;
-  color: #333;
+  background-color: #1e242d;
+  color: #c8d1d9;
+  border: 1px solid #30373c;
   min-width: 250px;
 }
 
 .theme-btn-provider:hover {
-  color: #999;
+  background-color: #25343a;
+  color: #ffffff;
 }
 
 .theme-btn--primary {
-  background-color: #2fc98e;
+  background-color: #1e242d;
   border: none;
-  color: #fff;
+  color: #c8d1d9;
   min-width: 200px;
   padding: 6px 12px;
 }
 
 .theme-btn--primary:hover {
-  background-color: #25a071;
-  color: #fff;
+  background-color: #425f69;
+  color: #e9e9e9;
 }
 
 .theme-btn--success {
-  background-color: #2FC98E;
-  color: #fff;
+  background-color: #233239;
+  color: #e9e9e9;
   width: 250px;
 }
 
 .theme-btn--success:hover {
-  background-color: #49E3A8;
+  background-color: #46add0;
 }
 
 .theme-form-row {
@@ -78,18 +87,17 @@
   padding: 6px 12px;
   font-size: 14px;
   line-height: 1.42857143;
-  color: #666;
-  border: 1px solid #CCC;
+  border: 1px solid #c8d1d9;
   border-radius: 4px;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgb(27, 40, 46);
   width: 250px;
   margin: auto;
 }
 
 .theme-form-input:focus,
 .theme-form-input:active {
   outline: none;
-  border-color: #66AFE9;
+  border-color: #1b282e;
 }
 
 .theme-form-label {
@@ -99,8 +107,13 @@
   position: relative;
   font-size: 13px;
   font-weight: 600;
+  color: #c8d1d9;
+}
+
+.theme-link-back {
+  margin-top: 4px;
 }
 
 .dex-container {
-  margin: 60px auto;
+  color: #c8d1d9;
 }