mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-29 02:59:52 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

Browse Source 
* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php
This commit is contained in:
Nils Adermann
2014-05-02 18:29:50 +02:00
parent f0be9549ac ed4b72d1f2
commit b187031082
22 changed files with 229 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/styles/prosilver/theme/common.css
View File

@@ -470,6 +470,7 @@ ul.linklist.bulletin li.no-bulletin:before {
border: 1px solid transparent;
border-radius: 5px;
padding: 9px 0 0;
margin-right: -500px;
}
.dropdown-container.topic-tools {
@@ -485,6 +486,8 @@ ul.linklist.bulletin li.no-bulletin:before {
.dropdown-left .dropdown, .nojs .rightside .dropdown {
left: auto;
right: 0;
margin-left: -500px;
margin-right: 0;
}
.dropdown-button-control .dropdown {