diff options
| author | Kailey Truscott <kinerity@yahoo.com> | 2015-07-06 00:43:29 -0400 |
|---|---|---|
| committer | Kailey Truscott <kinerity@yahoo.com> | 2015-07-06 01:43:03 -0400 |
| commit | 886ca1dbb9610325f082f3b0c93c65c088766429 (patch) | |
| tree | 46f524474179f1784c852f86325eb447a5b2cd89 /phpBB/styles | |
| parent | b346f216c2e8e02bca20bb3965c79109700a609f (diff) | |
| download | forums-886ca1dbb9610325f082f3b0c93c65c088766429.tar forums-886ca1dbb9610325f082f3b0c93c65c088766429.tar.gz forums-886ca1dbb9610325f082f3b0c93c65c088766429.tar.bz2 forums-886ca1dbb9610325f082f3b0c93c65c088766429.tar.xz forums-886ca1dbb9610325f082f3b0c93c65c088766429.zip | |
[ticket/13955] Fix javascript to conform to Google and add simple_header
Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header
PHPBB3-13955
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 20 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_header.html | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index ebe6470fee..fe0e44f896 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -28,19 +28,19 @@ --> <!-- IF S_ALLOW_CDN --> -<script> +<script type="text/javascript"> WebFontConfig = { - google: { - families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic'] - } + google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] } }; - - (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; + (function() { + var wf = document.createElement('script'); + wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + + '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js'; + wf.type = 'text/javascript'; + wf.async = 'true'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(wf, s); - })(document); + })(); </script> <!-- ENDIF --> <link href="{T_STYLESHEET_LINK}" rel="stylesheet"> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 637ac59465..e0c346a01c 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -7,19 +7,19 @@ <title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> <!-- IF S_ALLOW_CDN --> -<script> +<script type="text/javascript"> WebFontConfig = { - google: { - families: ['Open Sans:n6'] - } + google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] } }; - - (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; + (function() { + var wf = document.createElement('script'); + wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + + '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js'; + wf.type = 'text/javascript'; + wf.async = 'true'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(wf, s); - })(document); + })(); </script> <!-- ENDIF --> <link href="{T_STYLESHEET_LINK}" rel="stylesheet"> |