diff options
| author | Kailey Truscott <kinerity@yahoo.com> | 2015-07-06 16:43:57 -0400 |
|---|---|---|
| committer | Kailey Truscott <kinerity@yahoo.com> | 2015-07-06 16:43:57 -0400 |
| commit | 4ac22566834e349df45a8b8549db684e332d37e1 (patch) | |
| tree | 8124358f57bf3e64bc416a70f1930416465b9010 /phpBB | |
| parent | 886ca1dbb9610325f082f3b0c93c65c088766429 (diff) | |
| download | forums-4ac22566834e349df45a8b8549db684e332d37e1.tar forums-4ac22566834e349df45a8b8549db684e332d37e1.tar.gz forums-4ac22566834e349df45a8b8549db684e332d37e1.tar.bz2 forums-4ac22566834e349df45a8b8549db684e332d37e1.tar.xz forums-4ac22566834e349df45a8b8549db684e332d37e1.zip | |
[ticket/13955] Revert changes made in previous commit
Revert the javascript function change
Place the families code on it's own line
PHPBB3-13955
Diffstat (limited to 'phpBB')
| -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 fe0e44f896..ebe6470fee 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 type="text/javascript"> +<script> 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() { - 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]; + + (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"> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index e0c346a01c..baa6223754 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 type="text/javascript"> +<script> 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() { - 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]; + + (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"> |