diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-28 22:23:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-29 17:50:13 +0200 |
| commit | 9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2 (patch) | |
| tree | 0b28d1128df1a63efa70f01ec5d7c43f7d2d6325 /phpBB/styles | |
| parent | 9abfba51913a7c03cf72280ca45f27bab8b5bac9 (diff) | |
| download | forums-9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2.tar forums-9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2.tar.gz forums-9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2.tar.bz2 forums-9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2.tar.xz forums-9300ff4c6e9be5826f6e71acd44b8b18ea2b66b2.zip | |
[feature/soft-delete] Remove imageset/ which was created by merge conflict
We don't have imagesets in 3.1 anymore.
PHPBB3-9657
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/imageset/imageset.cfg | 117 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_topic_deleted.png (renamed from phpBB/styles/prosilver/imageset/icon_topic_deleted.png) | bin | 964 -> 964 bytes |
2 files changed, 0 insertions, 117 deletions
diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg deleted file mode 100644 index bfcf357045..0000000000 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ /dev/null @@ -1,117 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.7 - -# Images -img_site_logo = site_logo.gif*52*139 -img_poll_left = -img_poll_center = -img_poll_right = -img_icon_friend = -img_icon_foe = - -img_forum_link = forum_link.gif*27*27 -img_forum_read = forum_read.gif*27*27 -img_forum_read_locked = forum_read_locked.gif*27*27 -img_forum_read_subforum = forum_read_subforum.gif*27*27 -img_forum_unread = forum_unread.gif*27*27 -img_forum_unread_locked = forum_unread_locked.gif*27*27 -img_forum_unread_subforum = forum_unread_subforum.gif*27*27 - -img_topic_moved = topic_moved.gif*27*27 - -img_topic_read = topic_read.gif*27*27 -img_topic_read_mine = topic_read_mine.gif*27*27 -img_topic_read_hot = topic_read_hot.gif*27*27 -img_topic_read_hot_mine = topic_read_hot_mine.gif*27*27 -img_topic_read_locked = topic_read_locked.gif*27*27 -img_topic_read_locked_mine = topic_read_locked_mine.gif*27*27 - -img_topic_unread = topic_unread.gif*27*27 -img_topic_unread_mine = topic_unread_mine.gif*27*27 -img_topic_unread_hot = topic_unread_hot.gif*27*27 -img_topic_unread_hot_mine = topic_unread_hot_mine.gif*27*27 -img_topic_unread_locked = topic_unread_locked.gif*27*27 -img_topic_unread_locked_mine = topic_unread_locked_mine.gif*27*27 - -img_sticky_read = sticky_read.gif*27*27 -img_sticky_read_mine = sticky_read_mine.gif*27*27 -img_sticky_read_locked = sticky_read_locked.gif*27*27 -img_sticky_read_locked_mine = sticky_read_locked_mine.gif*27*27 -img_sticky_unread = sticky_unread.gif*27*27 -img_sticky_unread_mine = sticky_unread_mine.gif*27*27 -img_sticky_unread_locked = sticky_unread_locked.gif*27*27 -img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*27*27 - -img_announce_read = announce_read.gif*27*27 -img_announce_read_mine = announce_read_mine.gif*27*27 -img_announce_read_locked = announce_read_locked.gif*27*27 -img_announce_read_locked_mine = announce_read_locked_mine.gif*27*27 -img_announce_unread = announce_unread.gif*27*27 -img_announce_unread_mine = announce_unread_mine.gif*27*27 -img_announce_unread_locked = announce_unread_locked.gif*27*27 -img_announce_unread_locked_mine = announce_unread_locked_mine.gif*27*27 - -img_global_read = announce_read.gif*27*27 -img_global_read_mine = announce_read_mine.gif*27*27 -img_global_read_locked = announce_read_locked.gif*27*27 -img_global_read_locked_mine = announce_read_locked_mine.gif*27*27 -img_global_unread = announce_unread.gif*27*27 -img_global_unread_mine = announce_unread_mine.gif*27*27 -img_global_unread_locked = announce_unread_locked.gif*27*27 -img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27 - -img_subforum_read = subforum_read.gif*9*11 -img_subforum_unread = subforum_unread.gif*9*11 - -img_pm_read = topic_read.gif*27*27 -img_pm_unread = topic_unread.gif*27*27 - -img_icon_back_top = icon_back_top.gif*11*11 - -img_icon_contact_aim = icon_contact_aim.gif*20*20 -img_icon_contact_email = icon_contact_email.gif*20*20 -img_icon_contact_icq = icon_contact_icq.gif*20*20 -img_icon_contact_jabber = icon_contact_jabber.gif*20*20 -img_icon_contact_msnm = icon_contact_msnm.gif*20*20 - -img_icon_contact_www = icon_contact_www.gif*20*20 -img_icon_contact_yahoo = icon_contact_yahoo.gif*20*20 - -img_icon_post_delete = icon_post_delete.gif*20*20 - -img_icon_post_info = icon_post_info.gif*20*20 - -img_icon_post_report = icon_post_report.gif*20*20 -img_icon_post_target = icon_post_target.gif*9*11 -img_icon_post_target_unread = icon_post_target_unread.gif*9*11 - -img_icon_topic_attach = icon_topic_attach.gif*10*7 -img_icon_topic_latest = icon_topic_latest.gif*9*11 -img_icon_topic_newest = icon_topic_newest.gif*9*11 -img_icon_topic_reported = icon_topic_reported.gif*14*16 -img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16 -img_icon_topic_deleted = icon_topic_deleted.png*16*16 - -img_icon_user_profile = - -img_icon_user_warn = icon_user_warn.gif*20*20 diff --git a/phpBB/styles/prosilver/imageset/icon_topic_deleted.png b/phpBB/styles/prosilver/theme/images/icon_topic_deleted.png Binary files differindex e5359030f3..e5359030f3 100644 --- a/phpBB/styles/prosilver/imageset/icon_topic_deleted.png +++ b/phpBB/styles/prosilver/theme/images/icon_topic_deleted.png |
