diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-01 00:19:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-01 00:19:52 +0200 |
| commit | 3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b (patch) | |
| tree | 4096ffd5f76e12e3bdc02e2018715a1508d28134 | |
| parent | 7fba5a0f38f2a8e21c1717ff0311d28b5bda54dc (diff) | |
| parent | e5364088c310722e292566500973a28a300f258f (diff) | |
| download | forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.gz forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.bz2 forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.xz forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.zip | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[ticket/10773] ACP logo with registered trademark symbol
| -rw-r--r-- | phpBB/adm/images/phpbb_logo.gif | bin | 3883 -> 0 bytes | |||
| -rw-r--r-- | phpBB/adm/images/phpbb_logo.png | bin | 0 -> 9313 bytes | |||
| -rw-r--r-- | phpBB/adm/style/admin.css | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif Binary files differdeleted file mode 100644 index 239993182b..0000000000 --- a/phpBB/adm/images/phpbb_logo.gif +++ /dev/null diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png Binary files differnew file mode 100644 index 0000000000..c3f9248ed7 --- /dev/null +++ b/phpBB/adm/images/phpbb_logo.png diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 666f4921ba..b9996fd1d1 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -142,15 +142,15 @@ li { #page-header { clear: both; text-align: right; - background: url("../images/phpbb_logo.gif") top left no-repeat; - height: 49px; + background: url("../images/phpbb_logo.png") top left no-repeat; + height: 54px; font-size: 0.85em; margin-bottom: 10px; } .rtl #page-header { text-align: left; - background: url("../images/phpbb_logo.gif") top right no-repeat; + background: url("../images/phpbb_logo.png") top right no-repeat; } #page-header h1 { |
