aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorVjacheslav Trushkin <cyberalien@gmail.com>2013-07-14 14:12:42 -0400
committerAndreas Fischer <bantu@phpbb.com>2013-07-14 21:19:21 +0200
commit424040f8901cc4c075924c5d21d89fdfe9e6ca58 (patch)
treed52033aa1e2e25ed0d8779ba720a74dc73260756 /phpBB/styles
parent3139867e6d345a2d9f69e68d2629f31448a17634 (diff)
downloadforums-424040f8901cc4c075924c5d21d89fdfe9e6ca58.tar
forums-424040f8901cc4c075924c5d21d89fdfe9e6ca58.tar.gz
forums-424040f8901cc4c075924c5d21d89fdfe9e6ca58.tar.bz2
forums-424040f8901cc4c075924c5d21d89fdfe9e6ca58.tar.xz
forums-424040f8901cc4c075924c5d21d89fdfe9e6ca58.zip
[ticket/11345] Move css import to template
PHPBB3-11345
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/overall_header.html1
-rw-r--r--phpBB/styles/prosilver/template/simple_header.html1
-rw-r--r--phpBB/styles/prosilver/theme/stylesheet.css1
3 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ddbd917bd6..f513f42fc2 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -63,6 +63,7 @@
</script>
<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" />
+<link href="http://fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" />
<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" />
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 667698c371..913115a2ed 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -42,6 +42,7 @@
</script>
<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" />
+<link href="http://fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" />
<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" />
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index adc5bdff25..48a00c6803 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -7,7 +7,6 @@
--------------------------------------------------------------
*/
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese");
@import url("common.css");
@import url("links.css");
@import url("content.css");