diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-31 20:29:45 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-31 20:29:45 +0200 |
| commit | ba84268d4ed2d6498f87b5a466f2bd6465e48f42 (patch) | |
| tree | 2f55bd871af3f7f447fe321912b0a631b2c719ad /phpBB/styles | |
| parent | a618710a69cf797d2b64a3567b2d2da327cddc25 (diff) | |
| parent | fa6c1044b8b11baf1d100f695e8b17457d26fd4a (diff) | |
| download | forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.gz forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.bz2 forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.xz forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.zip | |
Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus
* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 3c4f03c073..7144e58fcc 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -91,6 +91,7 @@ <!-- EVENT overall_header_breadcrumb_append --> </li> + <!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF --> <!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF --> <!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 50683c6808..298d310ab1 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -444,6 +444,14 @@ ul.linklist.bulletin li.no-bulletin:before { display: none !important; } +/* Avatar in overall_header.html */ +.header-avatar img { + margin-bottom: 2px; + max-height: 25px; + vertical-align: middle; + width: auto; +} + /* Dropdown menu ----------------------------------------*/ .dropdown-container { |