diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 18:29:50 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 18:29:50 +0200 |
| commit | b187031082aa41e5d2da5537ca403677dc7e05ce (patch) | |
| tree | 39a0d07cf8d7454ee3586f7896450a95ddad8708 /phpBB/styles/prosilver/theme/images | |
| parent | f0be9549ac14c49cad44b1476382aedf2a6f4af8 (diff) | |
| parent | ed4b72d1f2e1cc96ebec845f9af97db406065c6b (diff) | |
| download | forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.gz forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.bz2 forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.xz forums-b187031082aa41e5d2da5537ca403677dc7e05ce.zip | |
Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus
* 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
Diffstat (limited to 'phpBB/styles/prosilver/theme/images')
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact.png | bin | 0 -> 340 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_aim.gif | bin | 546 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_email.gif | bin | 523 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_icq.gif | bin | 562 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif | bin | 1014 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif | bin | 1466 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_www.gif | bin | 590 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif | bin | 541 -> 0 bytes |
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icons_contact.png | bin | 0 -> 8507 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/theme/images/icon_contact.png b/phpBB/styles/prosilver/theme/images/icon_contact.png Binary files differnew file mode 100644 index 0000000000..04e4d9ad17 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/icon_contact.png diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif b/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif Binary files differdeleted file mode 100644 index be039fcde2..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_email.gif b/phpBB/styles/prosilver/theme/images/icon_contact_email.gif Binary files differdeleted file mode 100644 index caa3683005..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_email.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif b/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif Binary files differdeleted file mode 100644 index 48a09373eb..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif b/phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif Binary files differdeleted file mode 100644 index e335433e97..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif b/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif Binary files differdeleted file mode 100644 index e25469c3a5..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_www.gif b/phpBB/styles/prosilver/theme/images/icon_contact_www.gif Binary files differdeleted file mode 100644 index 83cee9728d..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_www.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif b/phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif Binary files differdeleted file mode 100644 index 305f297fdb..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icons_contact.png b/phpBB/styles/prosilver/theme/images/icons_contact.png Binary files differnew file mode 100644 index 0000000000..f84abd36a5 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/icons_contact.png |
