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

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

Browse source 
* PayBas/ticket/12506:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
This commit is contained in:
Cesar G 2014-08-25 13:13:25 -07:00
commit 7cd6dbe898
7 changed files with 51 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
<!-- ENDIF -->
<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
<div id="post-{MESSAGE_ID}" class="post pm has-profile<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
<div class="inner">
<dl class="postprofile" id="profile{MESSAGE_ID}">

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

@ -120,7 +120,7 @@
<!-- IF postrow.S_FIRST_UNREAD -->
<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a>
<!-- ENDIF -->
<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->">
<div id="p{postrow.POST_ID}" class="post has-profile <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->">
<div class="inner">
<dl class="postprofile" id="profile{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>

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

@ -464,6 +464,11 @@ li.breadcrumbs span:first-child > a {
float: right;
}
.rtl .has-profile .postbody h3 {
margin-right: 0;
margin-left: 180px;
}
.rtl p.post-notice {
padding-left: 5px;
padding-right: 26px;
@ -655,6 +660,11 @@ li.breadcrumbs span:first-child > a {
float: left;
}
.rtl .has-profile .post-buttons {
left: 0;
right: auto;
}
.rtl .post-buttons li {
float: right;
}
@ -1090,4 +1100,8 @@ li.breadcrumbs span:first-child > a {
margin-left: 5px;
margin-right: 0;
}
.rtl .has-profile .post-buttons {
left: 20px;
}
}

8
phpBB/styles/prosilver/theme/buttons.css
View file

@ -177,6 +177,14 @@ ul.linklist.bulletin > li.small-icon:before {
margin-top: 2px;
}
.has-profile .post-buttons {
float: none;
position: absolute;
margin: 0;
right: 0;
top: 5px;
}
.post-buttons > li {
float: left;
margin-right: 3px;

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

@ -299,6 +299,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
background-repeat: no-repeat;
background-position: 100% 0;
border-radius: 7px;
position: relative;
}
.rowbg {

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

@ -233,6 +233,7 @@ dd.option {
line-height: 1.48em;
width: 76%;
float: left;
position: relative;
}
.postbody .ignore {
@ -249,7 +250,8 @@ dd.option {
float: left;
font-size: 1.5em;
padding: 2px 0 0 0;
margin: 0 0 0.3em 0 !important;
margin-top: 0 !important;
margin-bottom: 0.3em !important;
text-transform: none;
border: none;
font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
@ -261,6 +263,12 @@ dd.option {
vertical-align: bottom;
}
.has-profile .postbody h3 {
/* If there is a post-profile, we position the post-buttons differently */
float: none !important;
margin-right: 180px;
}
.postbody .content {
font-size: 1.3em;
overflow-x: auto;

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

@ -398,6 +398,10 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
/* Post
----------------------------------------*/
.postbody {
position: inherit;
}
.postprofile, .postbody, .search .postbody {
display: block;
width: auto;
@ -412,6 +416,7 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
padding-bottom: 5px;
margin: 0;
margin-bottom: 5px;
min-height: 40px;
overflow: hidden;
}
@ -443,12 +448,18 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
max-height: 32px;
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 1.5dppx)
{
/* Scale online image for HD displays */
.online {
background-size: 40px;
}
.has-profile .postbody h3 {
margin-left: 0 !important;
margin-right: 0 !important;
}
.has-profile .post-buttons {
right: 20px;
top: 15px;
}
.online {
background-size: 40px;
}
/* Misc stuff