From 707c493e3cde9916e246c52f3ca129d1a0669526 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 18 Aug 2015 14:13:40 -0400
Subject: [PATCH] FIX: When changing colors, refresh the admin stylesheet

---
 app/assets/stylesheets/admin.css                    | 3 ---
 app/assets/stylesheets/admin.scss                   | 1 +
 app/assets/stylesheets/common/admin/admin_base.scss | 2 +-
 app/views/common/_discourse_stylesheet.html.erb     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 app/assets/stylesheets/admin.css
 create mode 100644 app/assets/stylesheets/admin.scss

diff --git a/app/assets/stylesheets/admin.css b/app/assets/stylesheets/admin.css
deleted file mode 100644
index 0bd2f7e77..000000000
--- a/app/assets/stylesheets/admin.css
+++ /dev/null
@@ -1,3 +0,0 @@
-//  Manifest
-//
-//= require_tree ./common/admin
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
new file mode 100644
index 000000000..d1de50da4
--- /dev/null
+++ b/app/assets/stylesheets/admin.scss
@@ -0,0 +1 @@
+@import "common/admin/admin_base"
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index a7c766508..ca47c70d4 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1662,4 +1662,4 @@ table#user-badges {
 
 .mobile-view .full-width {
   margin: 0;
-}
\ No newline at end of file
+}
diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index 2ccfc92b9..702bbd9f0 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -5,7 +5,7 @@
 <%- end %>
 
 <%- if staff? %>
-  <%= stylesheet_link_tag "admin"%>
+  <%= DiscourseStylesheets.stylesheet_link_tag(:admin) %>
 <%- end %>
 
 <%- unless customization_disabled? %>