From 39f8ef287af043e0724631094351c77b93191bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= Date: Fri, 6 Apr 2007 23:09:00 +0000 Subject: [PATCH] #8669 #8745 #8762 #5417 #9525 #9568 #9574 #9577 #9640 #9641 #9644 git-svn-id: file:///svn/phpbb/trunk@7291 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/admin.css | 2 ++ phpBB/adm/style/overall_header.html | 2 ++ .../top.gif => imageset/icon_back_top.gif} | Bin phpBB/styles/prosilver/imageset/imageset.cfg | 2 ++ .../prosilver/template/memberlist_body.html | 2 +- .../prosilver/template/posting_editor.html | 17 +++++++++++++---- .../prosilver/template/search_results.html | 5 +++-- .../prosilver/template/viewforum_body.html | 4 ++-- .../prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/theme/colours.css | 9 ++++++++- phpBB/styles/prosilver/theme/common.css | 4 ++-- phpBB/styles/prosilver/theme/forms.css | 4 ++-- phpBB/styles/prosilver/theme/tweaks.css | 8 ++++++++ phpBB/styles/subsilver2/imageset/imageset.cfg | 2 ++ 14 files changed, 48 insertions(+), 15 deletions(-) rename phpBB/styles/prosilver/{theme/images/top.gif => imageset/icon_back_top.gif} (100%) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 3eb8c68d99..0a5710f38c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1206,11 +1206,13 @@ input.disabled { width: 200px; color: #000; text-align: center; + border: 1px solid #AAA; } .tooltip span.top { background: #EFEFEF; font-weight: bold; + padding: 2px; } .tooltip span.bottom { diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index acbf00dff5..9024c08577 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -175,8 +175,10 @@ function switch_menu()
+
+
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 701983e404..98a3ff8c44 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -59,13 +59,14 @@ {searchresults.UNAPPROVED_IMG} {REPORTED_IMG}
{searchresults.PAGINATION} - {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {searchresults.NEWEST_POST_IMG} + {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {searchresults.NEWEST_POST_IMG} + {L_IN} {searchresults.FORUM_TITLE} ({L_GLOBAL})
{searchresults.TOPIC_REPLIES}
{searchresults.TOPIC_VIEWS}
{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} - {searchresults.LAST_POST_IMG}
{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME} + {searchresults.LAST_POST_IMG}
{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 1e55c9aecd..c9fb73f6d6 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -194,8 +194,8 @@ {L_MARK_TOPICS_READ} • {TOTAL_POSTS} {TOTAL_TOPICS} {TOTAL_USERS} - • {PAGE_NUMBER} - • {PAGINATION} + • {PAGE_NUMBER} + • {PAGINATION} • {PAGE_NUMBER}
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 1ccc10619f..e298c7e42b 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -208,7 +208,7 @@ -
{L_BACK_TO_TOP}
+
{L_BACK_TO_TOP}
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index bd93eb9493..37ca60320a 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -851,7 +851,7 @@ pmlist li.pm_foe_colour, .pm_foe_colour { /* Avatar gallery */ #gallery label { - background: #FFFFFF; + background-color: #FFFFFF; border-color: #CCC; } @@ -946,6 +946,13 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but color: #000000; } +/* Hover states */ +a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { + border: 1px solid #BC2A4D; + background-position: 0 100%; + color: #BC2A4D; +} + input.search { background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif"); } \ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 35a956b81b..935b81b9dd 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -429,14 +429,14 @@ dl.details { dl.details dt { float: left; - width: 11em; + width: 16em; text-align: right; color: #000000; display: block; } dl.details dd { - margin-left: 11em; + margin-left: 16em; padding-left: 5px; margin-bottom: 5px; color: #828282; diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 2d2eb56fed..006ed3b026 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -347,9 +347,9 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { - border: 1px solid #BC2A4D; + border: 1px solid #BCBCBC; background-position: 0 100%; - color: #BC2A4D; + color: #BCBCBC; } /* Topic and forum Search */ diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 387f2cf44b..4dd490ea33 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -45,3 +45,11 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra #tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls { height: 1%; } + +/* Simple fix so forum and topic lists always have a min-height set, even in IE6 + From http://www.dustindiaz.com/min-height-fast-hack */ +dl.icon { + min-height: 35px; + height: auto !important; + height: 35px; +} \ No newline at end of file diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg index c9d9442a0c..80c9c349c6 100644 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ b/phpBB/styles/subsilver2/imageset/imageset.cfg @@ -84,6 +84,8 @@ img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19 img_pm_read = topic_read.gif*18*19 img_pm_unread = topic_unread.gif*18*19 +img_icon_back_top = + img_icon_contact_aim = {LANG}/icon_contact_aim.gif img_icon_contact_email = {LANG}/icon_contact_email.gif img_icon_contact_icq = {LANG}/icon_contact_icq.gif