diff options
| author | Frédéric Bolvin <frederic@bolvin.de> | 2014-11-17 21:09:53 +0300 |
|---|---|---|
| committer | Frédéric Bolvin <frederic@bolvin.de> | 2014-11-17 21:26:35 +0300 |
| commit | fee2297d644f4e334859bff1b59fe361a3620d1b (patch) | |
| tree | f8579f4023e55eb9bbef1fc91f988ab0a30390a6 /plugins/Morpheus | |
| parent | f4c685368d18be51117cf2e97d629e26340d7910 (diff) | |
Fixes #6163
Moved IE conditional statements to body to prevent ignoring the X-UA-Compatible tag by IE
Diffstat (limited to 'plugins/Morpheus')
| -rw-r--r-- | plugins/Morpheus/stylesheets/general/_utils.less | 2 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/admin.twig | 11 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/dashboard.twig | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/plugins/Morpheus/stylesheets/general/_utils.less b/plugins/Morpheus/stylesheets/general/_utils.less index cd7faddea2..804012cb21 100644 --- a/plugins/Morpheus/stylesheets/general/_utils.less +++ b/plugins/Morpheus/stylesheets/general/_utils.less @@ -14,7 +14,7 @@ div.clear { } /* IE < 9 will use this */ -html.old-ie .ie-hide { +body.old-ie .ie-hide { display: none; } diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig index 02ba88a17e..cf93077218 100644 --- a/plugins/Morpheus/templates/admin.twig +++ b/plugins/Morpheus/templates/admin.twig @@ -1,8 +1,5 @@ <!DOCTYPE html> -<!--[if lt IE 9 ]> -<html class="old-ie" id="ng-app" ng-app="piwikApp"> <![endif]--> -<!--[if (gte IE 9)|!(IE)]><!--> -<html id="ng-app" ng-app="piwikApp"><!--<![endif]--> +<html id="ng-app" ng-app="piwikApp"> <head> {% block head %} <meta charset="utf-8"> @@ -21,7 +18,11 @@ <![endif]--> {% endblock %} </head> - <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"> + <!--[if lt IE 9 ]> + <body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'admin') }}"> + <![endif]--> + <!--[if (gte IE 9)|!(IE)]><!--> + <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"><!--<![endif]--> {% set isAdminLayout = true %} {% include "_iframeBuster.twig" %} {% include "@CoreHome/_javaScriptDisabled.twig" %} diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index 4235cacdd0..64e11b9c12 100644 --- a/plugins/Morpheus/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig @@ -1,8 +1,5 @@ <!DOCTYPE html> -<!--[if lt IE 9 ]> -<html class="old-ie" id="ng-app" ng-app="piwikApp"> <![endif]--> -<!--[if (gte IE 9)|!(IE)]><!--> -<html id="ng-app" ng-app="piwikApp"><!--<![endif]--> +<html id="ng-app" ng-app="piwikApp"> <head> {% block head %} <meta charset="utf-8"> @@ -24,7 +21,10 @@ <![endif]--> {% endblock %} </head> - <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'dashboard') }}"> + <!--[if lt IE 9 ]> + <body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'dashboard') }}"> <![endif]--> + <!--[if (gte IE 9)|!(IE)]><!--> + <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'dashboard') }}"><!--<![endif]--> {% include "_iframeBuster.twig" %} {% include "@CoreHome/_javaScriptDisabled.twig" %} |