Merge pull request #1423 from tvdeyen/welcome-screen-colors

Adjust the welcome screen to new color theme
AlchemyCMS · May 4, 2018 · 122ff1f · 122ff1f
2 parents 9e4fbe7 + a99b610
commit 122ff1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/app/assets/stylesheets/alchemy/welcome.sass b/app/assets/stylesheets/alchemy/welcome.sass
@@ -1,15 +1,16 @@
+@import "alchemy/variables"
+@import "alchemy/fonts"
+
 body
-  background: #f2f2f2
-  color: #7f8c8d
-  font-family: 'Open Sans', Helvetica, Arial, sans-serif
+  background-color: $main-menu-bg-color
+  color: $white
+  font-family: $default-font-family
   font-weight: normal
   font-size: 15px
   line-height: 22px
 
 h3
-  color: #34495e
-  font-family: 'Bitter', serif
-  font-weight: normal
+  font-weight: bold
   font-size: 25px
   line-height: 1.2
   margin-bottom: 20px
@@ -32,18 +33,17 @@ ul
   list-style-position: outside
 
 li
-  color: #2980b9
-  font-weight: 600
+  color: $white
   margin-bottom: 12px
   background-color: none
   border-bottom: 0 none
   line-height: 22px
 
 a
-  color: #87ab5a
+  color: $white
   text-decoration: underline
   transition: all 0.1s ease-in-out
 
   &:hover
-    color: #2980b9
-    text-decoration: underline
+    color: $white
+    text-decoration: none
diff --git a/app/views/alchemy/welcome.html.erb b/app/views/alchemy/welcome.html.erb
@@ -5,8 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Welcome to AlchemyCMS</title>
-    <link href='https://fonts.googleapis.com/css?family=Bitter' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     <%= stylesheet_link_tag "alchemy/welcome", media: "all" %>
   </head>
   <body>