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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

phpBB/styles/prosilver/theme/images/icon_contact.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 340 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_aim.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 546 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_email.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 523 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_icq.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 562 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1014 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

phpBB/styles/prosilver/theme/images/icon_contact_www.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 590 B

BIN

phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 541 B

BIN

phpBB/styles/prosilver/theme/images/icons_contact.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.3 KiB