From ff3458ff0380b0d12c96e4aeb3f0400fb275b0d1 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 7 Dec 2019 08:03:57 -1000 Subject: [ticket/16248] Add DS_Store to gitignore PHPBB3-16248 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 31145bc84b..c63fb6b02f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /tests/vendor /vagrant/phpbb-install-config.yml .vagrant +*.DS_Store* -- cgit v1.2.1 From 8ffbd66cba87bb880783ee6909d4f7414ce32858 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 7 Dec 2019 08:05:21 -1000 Subject: [ticket/16248] Swap out logos PHPBB3-16248 --- phpBB/styles/prosilver/template/overall_header.html | 9 ++++++++- phpBB/styles/prosilver/theme/colours.css | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 09824d0a16..51058297e1 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -84,7 +84,14 @@
- +

{SITENAME}

{SITE_DESCRIPTION}

{L_SKIP}

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index ffaa71034f..a0ebaef62f 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -148,9 +148,6 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { background-color: #E7E8EA; } -.site_logo { - background-image: url("./images/site_logo.gif"); -} /* Horizontal lists ----------------------------------------*/ -- cgit v1.2.1 From 0fc6fbf9169a8e4d66d83f50f842b357d553f9f7 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 7 Dec 2019 08:12:52 -1000 Subject: [ticket/16248] Remove all unused theme/images PHPBB3-16248 --- phpBB/styles/prosilver/theme/images/bg_header.gif | Bin 690 -> 0 bytes phpBB/styles/prosilver/theme/images/bg_list.gif | Bin 664 -> 0 bytes phpBB/styles/prosilver/theme/images/icon_download.gif | Bin 198 -> 0 bytes phpBB/styles/prosilver/theme/images/icon_offline.gif | Bin 322 -> 0 bytes phpBB/styles/prosilver/theme/images/icon_online.gif | Bin 331 -> 0 bytes phpBB/styles/prosilver/theme/images/icon_rate_bad.gif | Bin 465 -> 0 bytes phpBB/styles/prosilver/theme/images/icon_rate_good.gif | Bin 462 -> 0 bytes phpBB/styles/prosilver/theme/images/quote.gif | Bin 153 -> 0 bytes phpBB/styles/prosilver/theme/images/quote_rtl.gif | Bin 154 -> 0 bytes phpBB/styles/prosilver/theme/images/site_logo.gif | Bin 5070 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 phpBB/styles/prosilver/theme/images/bg_header.gif delete mode 100644 phpBB/styles/prosilver/theme/images/bg_list.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_download.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_offline.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_online.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_rate_bad.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_rate_good.gif delete mode 100644 phpBB/styles/prosilver/theme/images/quote.gif delete mode 100644 phpBB/styles/prosilver/theme/images/quote_rtl.gif delete mode 100644 phpBB/styles/prosilver/theme/images/site_logo.gif diff --git a/phpBB/styles/prosilver/theme/images/bg_header.gif b/phpBB/styles/prosilver/theme/images/bg_header.gif deleted file mode 100644 index 351de9f46a..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_header.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_list.gif b/phpBB/styles/prosilver/theme/images/bg_list.gif deleted file mode 100644 index 89f8963fde..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_list.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_download.gif b/phpBB/styles/prosilver/theme/images/icon_download.gif deleted file mode 100644 index 70cd61caf2..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_download.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_offline.gif b/phpBB/styles/prosilver/theme/images/icon_offline.gif deleted file mode 100644 index 5dc4212e9f..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_offline.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_online.gif b/phpBB/styles/prosilver/theme/images/icon_online.gif deleted file mode 100644 index d0d202dde5..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_online.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif b/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif deleted file mode 100644 index 7901889408..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_rate_good.gif b/phpBB/styles/prosilver/theme/images/icon_rate_good.gif deleted file mode 100644 index 6d23034d71..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_rate_good.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/quote.gif b/phpBB/styles/prosilver/theme/images/quote.gif deleted file mode 100644 index d1992273e6..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/quote.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/quote_rtl.gif b/phpBB/styles/prosilver/theme/images/quote_rtl.gif deleted file mode 100644 index ac719cf280..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/quote_rtl.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/site_logo.gif b/phpBB/styles/prosilver/theme/images/site_logo.gif deleted file mode 100644 index 2517fbedd6..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/site_logo.gif and /dev/null differ -- cgit v1.2.1 From 8be1ad4568495bb5240d02d93a62b2610bbdf471 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 7 Dec 2019 08:20:59 -1000 Subject: [ticket/16248] loaaaad svg old way for BC PHPBB3-16248 --- phpBB/styles/prosilver/template/overall_header.html | 7 +------ phpBB/styles/prosilver/theme/colours.css | 3 +++ phpBB/styles/prosilver/theme/common.css | 1 + phpBB/styles/prosilver/theme/images/site_logo.svg | 6 ++++++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 phpBB/styles/prosilver/theme/images/site_logo.svg diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 51058297e1..b1f7184a9d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -85,12 +85,7 @@

{SITENAME}

{SITE_DESCRIPTION}

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index a0ebaef62f..ded4f40811 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -148,6 +148,9 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { background-color: #E7E8EA; } +.site_logo { + background-image: url("./images/site_logo.svg"); +} /* Horizontal lists ----------------------------------------*/ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a0dc5e043b..eb04c66223 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -176,6 +176,7 @@ a:hover { text-decoration: underline; } } .site_logo { + background-repeat: no-repeat; display: inline-block; width: 149px; height: 52px; diff --git a/phpBB/styles/prosilver/theme/images/site_logo.svg b/phpBB/styles/prosilver/theme/images/site_logo.svg new file mode 100644 index 0000000000..4ce8903417 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/site_logo.svg @@ -0,0 +1,6 @@ + + + + + + -- cgit v1.2.1 From d65927674910b3f86c5af47731561ef51087af77 Mon Sep 17 00:00:00 2001 From: hanakin Date: Sun, 8 Dec 2019 00:07:57 -1000 Subject: [ticket/16248] fix logo in acp PHPBB3-16248 --- phpBB/adm/images/phpbb_logo.svg | 6 ++++++ phpBB/adm/style/admin.css | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 phpBB/adm/images/phpbb_logo.svg diff --git a/phpBB/adm/images/phpbb_logo.svg b/phpBB/adm/images/phpbb_logo.svg new file mode 100644 index 0000000000..2a241067f9 --- /dev/null +++ b/phpBB/adm/images/phpbb_logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 4f0a3312e4..da5c50f260 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -191,7 +191,7 @@ li { #page-header { text-align: right; - background: url("../images/phpbb_logo.png") top left no-repeat; + background: url("../images/phpbb_logo.svg") top left no-repeat; height: 54px; font-size: 0.85em; margin-bottom: 10px; @@ -199,7 +199,7 @@ li { .rtl #page-header { text-align: left; - background: url("../images/phpbb_logo.png") top right no-repeat; + background: url("../images/phpbb_logo.svg") top right no-repeat; } #page-header h1 { -- cgit v1.2.1 From fce796517b7feb88468d52e96db8d3c1d3a41cbe Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 17 Dec 2019 14:28:53 -0800 Subject: [ticket/16248] Convert to twig PHPBB3-16248 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index b1f7184a9d..44b580a903 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -84,7 +84,7 @@
-

{SITENAME}

-- cgit v1.2.1 From 26c4dfb9d783e78436f7c8ddc4f84bb84f8eb125 Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 17 Dec 2019 15:35:15 -0800 Subject: [ticket/16248] add quotes to lang PHPBB3-16248 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 44b580a903..992e040152 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -84,7 +84,7 @@
-

{SITENAME}

-- cgit v1.2.1 From 8e54e5cc798b522d84ebd95b4fd5da398ba175b9 Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 17 Dec 2019 17:41:21 -0800 Subject: [ticket/16248] stupid lack of standards are stupid PHPBB3-16248 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 992e040152..2867802de4 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -84,7 +84,7 @@
-

{SITENAME}

-- cgit v1.2.1