From d4b1e2f4f6aa6a863b14aaaee96115dfbb6ea149 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 12 May 2013 23:25:53 +0300 Subject: [PATCH 1/5] [ticket/11345] Change font for buttons Change font to Open Sans PHPBB3-11345 --- phpBB/styles/prosilver/theme/buttons.css | 3 ++- phpBB/styles/prosilver/theme/colours.css | 1 - phpBB/styles/prosilver/theme/stylesheet.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 9336dd09f8..4a8d43079a 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -27,7 +27,8 @@ border-radius: 4px; background: transparent none 0 0 repeat-x; padding: 2px 22px 2px 8px; - font-family: Verdana, Arial, Helvetica; + font-family: "Open Sans", Verdana, Arial, Helvetica; + font-weight: 600; position: relative; text-decoration: none !important; outline-style: none !important; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 7d0462be1b..7449014801 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1111,4 +1111,3 @@ input.disabled { .notification_list .pointer_inner { border-bottom-color: #F1F8FF; } - diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 48a00c6803..adc5bdff25 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -7,6 +7,7 @@ -------------------------------------------------------------- */ +@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"); From 3139867e6d345a2d9f69e68d2629f31448a17634 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 11 Jul 2013 11:32:52 -0400 Subject: [PATCH 2/5] [ticket/11345] Add Droid Sans as fallback font PHPBB3-11345 --- phpBB/styles/prosilver/theme/buttons.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 4a8d43079a..3860869501 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -27,7 +27,7 @@ border-radius: 4px; background: transparent none 0 0 repeat-x; padding: 2px 22px 2px 8px; - font-family: "Open Sans", Verdana, Arial, Helvetica; + font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; font-weight: 600; position: relative; text-decoration: none !important; From 424040f8901cc4c075924c5d21d89fdfe9e6ca58 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 14 Jul 2013 14:12:42 -0400 Subject: [PATCH 3/5] [ticket/11345] Move css import to template PHPBB3-11345 --- phpBB/styles/prosilver/template/overall_header.html | 1 + phpBB/styles/prosilver/template/simple_header.html | 1 + phpBB/styles/prosilver/theme/stylesheet.css | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) 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 @@ + 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 @@ + 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"); From b9fa2089d56d16d8a8cd84bb8ae06d85fec5506a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 14 Jul 2013 21:13:21 +0200 Subject: [PATCH 4/5] [ticket/11345] Wrap remote webfonts in S_ALLOW_CDN. PHPBB3-11345 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- phpBB/styles/prosilver/template/simple_header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index f513f42fc2..73ddc29efc 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -63,7 +63,7 @@ - + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 913115a2ed..c89c50570a 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -42,7 +42,7 @@ - + From 9c223cdd88a6c4687b8a58c84ad9c7770a5e78ca Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 18 Jul 2013 22:50:17 +0200 Subject: [PATCH 5/5] [ticket/11345] Don't include scheme, so HTTPS is used where necessary. PHPBB3-11345 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- phpBB/styles/prosilver/template/simple_header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 73ddc29efc..3a730f2daf 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -63,7 +63,7 @@ - + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index c89c50570a..d198480d06 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -42,7 +42,7 @@ - +