diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-09 11:56:03 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-09 11:56:03 +0100 |
| commit | 77a6b78dd4732d6943963e4ed9b0775ffe615db6 (patch) | |
| tree | 1d0f24eba4f6b642ebf366940fbe2a570713cc83 /templates/web/default/header.html | |
| parent | c721134411970bbd987857e68d04f6810ba86b71 (diff) | |
| parent | de4dcf6c785dff4775dee837f1156f2e16e30b6b (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into open311-consumer
Conflicts:
web/css/core.css
Diffstat (limited to 'templates/web/default/header.html')
| -rw-r--r-- | templates/web/default/header.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/web/default/header.html b/templates/web/default/header.html index 431e6db65..8fffbda88 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -2,13 +2,14 @@ <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 %] |