aboutsummaryrefslogtreecommitdiffstats
path: root/lib/views
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-01-24 10:35:13 +0000
committerLouise Crow <louise.crow@gmail.com>2014-01-24 10:35:13 +0000
commite19a0d6edbfdbbec18240c4f96941a9b288f2617 (patch)
treea0f0cbe528c99f64c5c870030b6133ff7ccc53c2 /lib/views
parent3f0b2ccb10aa58c5471c92b44633ae78e0386f68 (diff)
parente3b0227230807d8471c7311520f599bba3806f3f (diff)
Merge branch 'develop'
Diffstat (limited to 'lib/views')
-rw-r--r--lib/views/general/_before_head_end.html.erb2
-rw-r--r--lib/views/general/_orglink.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
index 1644299..9f8f339 100644
--- a/lib/views/general/_before_head_end.html.erb
+++ b/lib/views/general/_before_head_end.html.erb
@@ -1 +1 @@
-<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %>
+<%= stylesheet_link_tag "application" %>
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
index 9535a79..6a83ffb 100644
--- a/lib/views/general/_orglink.html.erb
+++ b/lib/views/general/_orglink.html.erb
@@ -1 +1 @@
-<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %>
+<%= link_to image_tag('alaveteli-logo.png'), frontpage_url, :id=>'logo' %>