Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
This commit is contained in:
Andreas Fischer 2012-07-01 00:20:04 +02:00
commit d998ad4b15
3 changed files with 3 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

View file

@ -146,15 +146,15 @@ li {
#page-header { #page-header {
clear: both; clear: both;
text-align: right; text-align: right;
background: url("../images/phpbb_logo.gif") top left no-repeat; background: url("../images/phpbb_logo.png") top left no-repeat;
height: 49px; height: 54px;
font-size: 0.85em; font-size: 0.85em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.rtl #page-header { .rtl #page-header {
text-align: left; 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 { #page-header h1 {