diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
| commit | 3b5d561700b184c20e63111d4cbc1daab78e16c6 (patch) | |
| tree | f0c53c6bf8d4ebf12e5388053ad856fb0d0e7b86 /templates/web/default/header.html | |
| parent | 390f8e8ad1e10f832c4323c39bed2c883744a03f (diff) | |
| parent | f38b8e985697c35a62374a2f02dce2d681ef58cd (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/User.pm
t/app/controller/admin.t
templates/web/default/admin/update_edit.html
web/css/core.css
Diffstat (limited to 'templates/web/default/header.html')
| -rw-r--r-- | templates/web/default/header.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/templates/web/default/header.html b/templates/web/default/header.html index 431e6db65..b2bfd27d7 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -2,17 +2,19 @@ <html lang="[% lang_code %]"> <head> - [% INCLUDE 'common_header_tags.html' %] - - <style type="text/css">@import url("/css/core.css"); @import url("/css/main.css");</style> + <link rel="stylesheet" type="text/css" href="/css/core.css"> + <link rel="stylesheet" type="text/css" href="/css/main.css"> <!--[if LT IE 7]> - <style type="text/css">@import url("/css/ie6.css");</style> + <link rel="stylesheet" type="text/css" href="/css/ie6.css"> <![endif]--> + [% INCLUDE 'common_header_tags.html' %] + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] + [% INCLUDE 'tracking_code.html' %] </head> <body> |