makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'PayBas/ticket/12535' into develop-ascraeus

Browse source 
* PayBas/ticket/12535:
  [ticket/12535] Combine inner clearing CSS rules
  [ticket/12535] Update events.md to RC3
  [ticket/12535] Add events to subsilver2
  [ticket/12535] Make <a> adjust to the image width
This commit is contained in:
Cesar G 2014-08-08 13:46:58 +02:00
commit ad97ad07f8
10 changed files with 96 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/docs/events.md
View file

@ -879,6 +879,20 @@ ucp_agreement_terms_before
* Since: 3.1.0-b3
* Purpose: Add content before the terms of agreement text at user registration
ucp_pm_viewmessage_avatar_after
===
* Locations:
+ styles/prosilver/template/ucp_pm_viewmessage.html
* Since: 3.1.0-RC3
* Purpose: Add content right after the avatar when viewing a private message
ucp_pm_viewmessage_avatar_before
===
* Locations:
+ styles/prosilver/template/ucp_pm_viewmessage.html
* Since: 3.1.0-RC3
* Purpose: Add content right before the avatar when viewing a private message
ucp_pm_viewmessage_contact_fields_after
===
* Locations:
@ -1085,6 +1099,22 @@ viewtopic_print_head_append
* Since: 3.1.0-a1
* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
viewtopic_body_avatar_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
+ styles/subsilver2/template/viewtopic_body.html
* Since: 3.1.0-RC3
* Purpose: Add content right after the avatar when viewing topics
viewtopic_body_avatar_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
+ styles/subsilver2/template/viewtopic_body.html
* Since: 3.1.0-RC3
* Purpose: Add content right before the avatar when viewing topics
viewtopic_body_contact_fields_after
===
* Locations:

9
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -18,7 +18,14 @@
<div class="inner">
<dl class="postprofile" id="profile{MESSAGE_ID}">
<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF -->"><!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF -->{MESSAGE_AUTHOR_FULL}</dt>
<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF AUTHOR_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
<div class="avatar-container">
<!-- EVENT ucp_pm_viewmessage_avatar_before -->
<!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF -->
<!-- EVENT ucp_pm_viewmessage_avatar_after -->
</div>
{MESSAGE_AUTHOR_FULL}
</dt>
<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->

12
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -124,10 +124,14 @@
<div class="inner">
<dl class="postprofile" id="profile{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>
<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF -->">
<!-- IF postrow.POSTER_AVATAR -->
<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="avatar">{postrow.POSTER_AVATAR}</a><!-- ELSE --><span class="avatar">{postrow.POSTER_AVATAR}</span><!-- ENDIF -->
<!-- ENDIF -->
<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF postrow.POSTER_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
<div class="avatar-container">
<!-- EVENT viewtopic_body_avatar_before -->
<!-- IF postrow.POSTER_AVATAR -->
<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="avatar">{postrow.POSTER_AVATAR}</a><!-- ELSE --><span class="avatar">{postrow.POSTER_AVATAR}</span><!-- ENDIF -->
<!-- ENDIF -->
<!-- EVENT viewtopic_body_avatar_after -->
</div>
<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
</dt>

9
phpBB/styles/prosilver/theme/bidi.css
View file

@ -582,6 +582,10 @@ li.breadcrumbs span:first-child > a {
margin-right: 8px;
}
.rtl .postprofile .avatar {
float: right;
}
.rtl .online {
background-position: 0 0;
}
@ -1074,8 +1078,11 @@ li.breadcrumbs span:first-child > a {
border-width: 0 0 1px 0;
}
.rtl .postprofile dt, .rtl .postprofile dd.profile-rank, .rtl .search .postprofile dd {
margin: 0;
}
.rtl .postprofile .avatar {
float: right;
margin-left: 5px;
margin-right: 0;
}

38
phpBB/styles/prosilver/theme/common.css
View file

@ -305,12 +305,6 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
border-radius: 7px;
}
.inner:after {
content: '';
clear: both;
display: block;
}
.rowbg {
margin: 5px 5px 2px 5px;
}
@ -326,12 +320,6 @@ ul.linklist {
margin: 0;
}
ul.linklist:after {
content: '';
display: block;
clear: both;
}
#cp-main .panel {
padding: 5px 10px;
}
@ -856,12 +844,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin-top: 2em;
}
.action-bar:after {
clear: both;
content: '';
display: block;
}
/* Pagination
---------------------------------------- */
.pagination {
@ -1130,6 +1112,20 @@ form > p.post-notice strong {
background: transparent;
}
/* Inner box-model clearing */
.inner:after,
ul.linklist:after,
.action-bar:after,
.notification_text:after,
.tabs-container:after,
#tabs > ul:after,
#minitabs > ul:after,
.postprofile .avatar-container:after {
clear: both;
content: '';
display: block;
}
.hidden {
display: none;
}
@ -1285,12 +1281,6 @@ form > p.post-notice strong {
margin-left: 58px;
}
.notification_text:after {
content: '';
clear: both;
display: block;
}
/* Navbar specific list items
----------------------------------------*/

13
phpBB/styles/prosilver/theme/content.css
View file

@ -710,15 +710,22 @@ fieldset.polls dd div {
margin-bottom: 10px;
}
/* Post-profile avatars */
.postprofile .has-avatar .avatar-container {
margin-bottom: 3px;
overflow: hidden;
}
.postprofile .avatar {
display: block;
border: none;
margin-bottom: 3px;
float: left;
max-width: 100%;
}
.postprofile .avatar img {
max-width: 90%;
display: block;
height: auto !important;
max-width: 100%;
}
dd.profile-warnings {

12
phpBB/styles/prosilver/theme/cp.css
View file

@ -96,12 +96,6 @@ ul.cplist {
margin-bottom: 0px;
}
.tabs-container:after {
clear: both;
content: '';
display: block;
}
/* CP tabs shared
----------------------------------------*/
#tabs, #minitabs {
@ -115,12 +109,6 @@ ul.cplist {
position: relative;
}
#tabs > ul:after, #minitabs > ul:after {
clear: both;
content: '';
display: block;
}
#tabs .tab, #minitabs .tab {
display: inline-block;
float: left;

12
phpBB/styles/prosilver/theme/responsive.css
View file

@ -424,16 +424,22 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
margin: 0;
}
.postprofile .has-avatar .avatar-container {
margin: 0;
overflow: inherit;
}
.postprofile .avatar-container:after {
clear: none;
}
.postprofile .avatar {
display: block;
float: left;
margin-right: 5px;
}
.postprofile .avatar img {
width: auto !important;
height: auto !important;
display: block;
max-height: 32px;
}

5
phpBB/styles/prosilver/theme/tweaks.css
View file

@ -71,3 +71,8 @@ dd.option {
.header-avatar img {
height: 20px;
}
/* IE8 often can't handle max-width in %, so we use px instead */
.postprofile .avatar img {
max-width: 150px;
}

4
phpBB/styles/subsilver2/template/viewtopic_body.html
View file

@ -192,11 +192,15 @@
<td>{postrow.RANK_IMG}</td>
</tr>
<!-- ENDIF -->
<!-- EVENT viewtopic_body_avatar_before -->
<!-- IF postrow.POSTER_AVATAR -->
<tr>
<td>{postrow.POSTER_AVATAR}</td>
</tr>
<!-- ENDIF -->
<!-- EVENT viewtopic_body_avatar_after -->
<!-- IF not (postrow.ONLINE_IMG or postrow.RANK_TITLE or postrow.RANK_IMG or postrow.POSTER_AVATAR) -->
<tr>
<td></td>