diff options
| author | Mark Longair <mhl@pobox.com> | 2013-09-26 15:50:55 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-09-30 10:34:36 +0100 |
| commit | 091cb7ab80ceddca8de787b73afd037fe72a41f0 (patch) | |
| tree | fe4756d731bceef214e3b3529d541c407f7db348 /app | |
| parent | 2da3d62c10d830f9e9a2270a6412f892122c7436 (diff) | |
WiP: also move admin CSS and images into the asset pipeline
We no longer need to run compass to regenerate the admin CSS - it
will be done automatically.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/images/glyphicons-halflings-white.png | bin | 0 -> 8777 bytes | |||
| -rw-r--r-- | app/assets/images/glyphicons-halflings.png | bin | 0 -> 13826 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/admin.scss (renamed from app/sass/admin.scss) | 0 | ||||
| -rw-r--r-- | app/views/layouts/admin.html.erb | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png Binary files differnew file mode 100644 index 000000000..3bf6484a2 --- /dev/null +++ b/app/assets/images/glyphicons-halflings-white.png diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png Binary files differnew file mode 100644 index 000000000..79bc568c2 --- /dev/null +++ b/app/assets/images/glyphicons-halflings.png diff --git a/app/sass/admin.scss b/app/assets/stylesheets/admin.scss index 584b0d00d..584b0d00d 100644 --- a/app/sass/admin.scss +++ b/app/assets/stylesheets/admin.scss diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 3c3870524..ecbc55ea3 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -6,7 +6,7 @@ <%= javascript_include_tag "admin" %> <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%> - <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag "admin", :title => "Main", :rel => "stylesheet" %> </head> <body class="admin"> |
