aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPayBas <contact@paybas.com>2014-06-13 13:29:50 +0200
committerPayBas <contact@paybas.com>2014-06-13 13:29:50 +0200
commitf17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3 (patch)
tree5722faf227e16852dd886eb45c302ba9c5f1b9c6 /phpBB
parent7c527adee87096d26087d82984b6f283db63832e (diff)
downloadforums-f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3.tar
forums-f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3.tar.gz
forums-f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3.tar.bz2
forums-f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3.tar.xz
forums-f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3.zip
[ticket/12613] Remove responsive linklist from memberlist
PHPBB3-12613
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/memberlist_body.html33
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css4
-rw-r--r--phpBB/styles/prosilver/theme/common.css49
-rw-r--r--phpBB/styles/prosilver/theme/content.css27
4 files changed, 56 insertions, 57 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 1e4ac4b204..07b525eed3 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -13,7 +13,6 @@
<!-- ENDIF -->
<!-- IF S_SHOW_GROUP -->
-
<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
<p>{GROUP_DESC} {GROUP_TYPE}</p>
<p>
@@ -21,36 +20,30 @@
<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->
</p>
-
<!-- ELSE -->
<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
- <div class="panel">
- <div class="inner">
-
- <ul class="linklist wrap">
- <li>
+ <div class="action-bar">
+ <div class="member-search panel">
<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
- <strong style="font-size: 0.95em;">
+ <strong>
<!-- BEGIN first_char -->
<a href="{first_char.U_SORT}">{first_char.DESC}</a>&nbsp;
<!-- END first_char -->
</strong>
- </li>
- <li class="rightside pagination">
- {TOTAL_USERS}
- <!-- IF .pagination -->
- &bull;
- <!-- INCLUDE pagination.html -->
- <!-- ELSE -->
- {PAGE_NUMBER}
- <!-- ENDIF -->
- </li>
- </ul>
-
+ </div>
+
+ <div class="pagination">
+ {TOTAL_USERS}
+ <!-- IF .pagination -->
+ <!-- INCLUDE pagination.html -->
+ <!-- ELSE -->
+ &bull; {PAGE_NUMBER}
+ <!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
+
<!-- IF S_LEADERS_SET or not S_SHOW_GROUP or not .memberrow -->
<div class="forumbg forumbg-table">
<div class="inner">
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index bce86db1a5..b1e1e10c3c 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -258,6 +258,10 @@
width: 99%; /* fix for IE6 */
}
+.rtl .member-search {
+ float: right;
+}
+
/**
* links.css
*/
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8a9df319c3..12297e095b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -802,6 +802,35 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin-left: 0 !important;
}
+/* Action-bars (container for post/reply buttons, pagination, etc.)
+---------------------------------------- */
+.topic-actions {
+ margin-bottom: 3px;
+ font-size: 1.1em;
+ height: 28px;
+ min-height: 28px;
+}
+div[class].topic-actions {
+ height: auto;
+}
+
+.topic-actions:after {
+ clear: both;
+ content: '';
+ display: block;
+}
+
+.action-bar {
+ font-size: 11px;
+ margin: 4px 0;
+}
+
+.action-bar:after {
+ clear: both;
+ content: '';
+ display: block;
+}
+
/* Pagination
---------------------------------------- */
.pagination {
@@ -876,16 +905,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
.pagination li.next a:hover { background-position: -50px -18px; }
.pagination li.previous a:hover { background-position: -30px -18px; }
-/* Memberlist search */
-li.pagination {
- margin-top: 0;
-}
-
-li.pagination > ul {
- margin-top: -2px;
- vertical-align: middle;
-}
-
/* Pagination in viewforum for multipage topics */
.row .pagination {
display: block;
@@ -1084,6 +1103,16 @@ form > p.post-notice strong {
position: relative;
}
+.member-search {
+ float: left;
+ margin: 0;
+ padding: 6px 10px;
+}
+
+.member-search strong {
+ font-size: 0.95em;
+}
+
.dropdown-extended {
display: none;
position: absolute;
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 1956a61f8e..6865af564d 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -226,33 +226,6 @@ dd.option {
font-size: 1.1em;
}
-/* Container for post/reply buttons and pagination */
-.topic-actions {
- margin-bottom: 3px;
- font-size: 1.1em;
- height: 28px;
- min-height: 28px;
-}
-div[class].topic-actions {
- height: auto;
-}
-
-.topic-actions:after {
- clear: both;
- content: '';
- display: block;
-}
-
-.action-bar {
- margin: 4px 0;
-}
-
-.action-bar:after {
- clear: both;
- content: '';
- display: block;
-}
-
/* Post body styles
----------------------------------------*/
.postbody {