diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
| commit | 17e2024962b84f759b1f2bfb13564d6626f0d6f0 (patch) | |
| tree | 70c20452176bfce76ef5a34b698e6ac615f66c23 /app/views/general/_stylesheet_includes.rhtml | |
| parent | e3887f042ba1309985e58ce553de0de05227dc56 (diff) | |
| parent | 19d6e36039318cdb1f9aa9e0c4731b500b3b0aeb (diff) | |
Merge branch 'release/0.6.3' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'app/views/general/_stylesheet_includes.rhtml')
| -rw-r--r-- | app/views/general/_stylesheet_includes.rhtml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/app/views/general/_stylesheet_includes.rhtml b/app/views/general/_stylesheet_includes.rhtml new file mode 100644 index 000000000..2ffa5dadf --- /dev/null +++ b/app/views/general/_stylesheet_includes.rhtml @@ -0,0 +1,21 @@ + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all" %> + <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print" %> + <% if !params[:print_stylesheet].nil? %> + <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all" %> + <% end %> + <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%> + <!--[if LT IE 7]> + <style type="text/css">@import url("/stylesheets/ie6.css");</style> + <![endif]--> + <!--[if LT IE 7]> + <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> + <![endif]--> + <!--[if LT IE 8]> + <style type="text/css">@import url("/stylesheets/ie7.css");</style> + <![endif]--> + <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail --> + <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> + <% if force_registration_on_new_request %> + <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> + <% end %> |