Updated themes for correct bootstrap version - icons need fixing

wpivex · Dec 27, 2017 · 9de8c47 · 9de8c47
1 parent a9f65fa
commit 9de8c47
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/models/user.rb b/models/user.rb
@@ -12,7 +12,7 @@ class User < Sequel::Model
   HASH_BYTES = 24
   SALT_BYTES = 24
   PERMISSION_MAP = { "readonly" => "Read-only", "editor" => "Editor", "admin" => "Administrator" }
-  THEMES = {"classic" => "Classic", "darkly" => "Darkly"}
+  THEMES = {"classic" => "Classic", "cyborg" => "Cyborg", "slate" => "Slate"}
   # Checks the given credentials against the database. Returns the user object on success and nil otherwise.
   def self.authenticate(email, password)
     user = User[:email => email]

diff --git a/public/css/cyborg/bootstrap.min.css b/public/css/cyborg/bootstrap.min.css
diff --git a/public/css/slate/bootstrap.min.css b/public/css/slate/bootstrap.min.css
diff --git a/views/header.erb b/views/header.erb
@@ -4,10 +4,12 @@
   <meta charset="utf-8">
   <title>Cheesy Parts</title>
   <link rel="shortcut icon" href="//media.team254.com/homepage/icons/favicon32.png">
-  <% if @user && @user.theme?("classic") %>
-    <link href="/css/bootstrap.min.css" rel="stylesheet">  <% end %>
-  <% if @user && @user.theme?("darkly") %>
-    <link href="/css/dark/bootstrap.min.css" rel="stylesheet">
+  <% if @user && @user.theme?("slate") %>
+    <link href="/css/slate/bootstrap.min.css" rel="stylesheet">
+  <% elsif @user && @user.theme?("cyborg") %>
+    <link href="/css/cyborg/bootstrap.min.css" rel="stylesheet">
+  <% else %>
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
   <% end %>
   <link href="/css/bootstrap-datepicker.css" rel="stylesheet">
   <link href='/css/css.css' rel='stylesheet' type='text/css' />