diff options
| author | Marius Halden <marius.h@lden.org> | 2017-05-28 21:31:42 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-05-28 21:31:42 +0200 |
| commit | 987124b09a32248414faf4d0d6615d43b29ac6f6 (patch) | |
| tree | a549db8af723c981d3b346e855f25d6fd5ff8aa7 /templates/web/base/header.html | |
| parent | dbf56159e44c1560a413022451bf1a1c4cb22a52 (diff) | |
| parent | a085b63ce09f87e83b75cda9b9cd08aadfe75d61 (diff) | |
Merge tag 'v2.0.4' into fiksgatami-dev
Diffstat (limited to 'templates/web/base/header.html')
| -rw-r--r-- | templates/web/base/header.html | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/templates/web/base/header.html b/templates/web/base/header.html index c11e78b47..4e537a7ec 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -7,7 +7,10 @@ <!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]--> <!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]--> <!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]--> -<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]--> +<!--[if gt IE 9]><!--><html class="no-js"[% html_att %] +[% IF appcache ~%] + manifest="/offline/appcache.manifest" +[%~ END %]><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> @@ -16,19 +19,11 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - [% - # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts - # it stylesheets under fixmystreet.com - IF c.cobrand.moniker == 'fixmystreet'; - SET css_dir = 'fixmystreet.com'; - ELSE; - SET css_dir = c.cobrand.moniker; - END %] - <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]"> <![endif]--> [% INCLUDE 'common_header_tags.html' %] |