diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 07:44:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 07:44:58 +0200 |
| commit | f688bc6160b6b6abf520dd538568441f7e84d390 (patch) | |
| tree | b12ddc8af64e6615d2596e00331c82c7cf5f7279 /phpBB/styles/prosilver/template/simple_header.html | |
| parent | e59b96e968a4f958fb18dae0a7396932170c3764 (diff) | |
| parent | e6407907e289f4f0a6e141eeebfe02c60110904c (diff) | |
| download | forums-f688bc6160b6b6abf520dd538568441f7e84d390.tar forums-f688bc6160b6b6abf520dd538568441f7e84d390.tar.gz forums-f688bc6160b6b6abf520dd538568441f7e84d390.tar.bz2 forums-f688bc6160b6b6abf520dd538568441f7e84d390.tar.xz forums-f688bc6160b6b6abf520dd538568441f7e84d390.zip | |
Merge branch 'ticket/13938' into prep-release-3.1.5
Diffstat (limited to 'phpBB/styles/prosilver/template/simple_header.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_header.html | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index ab4f855a97..637ac59465 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -6,18 +6,32 @@ {META} <title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> -<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> -<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF --> -<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> -<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> -<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" /> +<!-- IF S_ALLOW_CDN --> +<script> + WebFontConfig = { + google: { + families: ['Open Sans:n6'] + } + }; + + (function(d) { + var wf = d.createElement('script'), s = d.scripts[0]; + wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; + wf.async = true; + s.parentNode.insertBefore(wf, s); + })(document); +</script> +<!-- ENDIF --> +<link href="{T_STYLESHEET_LINK}" rel="stylesheet"> +<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet"> +<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)"> <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> - <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> + <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <!-- ENDIF --> <!--[if lte IE 8]> - <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> + <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <![endif]--> <!-- DEFINE $POPUP = 1 --> |