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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12813] Move inline-CSS to css file
  [ticket/12813] Use -moz-only fix instead of generic padding
  [ticket/12813] Reorder .row pagination so it aligns better
  [ticket/12813] Fix page-jump title lang and use input type=number
  [ticket/12811] Responsive adjustments to margin changes
  [ticket/12811] Fix padding/margin bug affecting bottom layout
This commit is contained in:
Cesar G 2014-07-07 01:34:05 -07:00
commit 1a6ccd0f1f
7 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/styles/prosilver/template/mcp_forum.html
View file

@ -48,6 +48,13 @@
<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF --> <!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
<br /> <br />
<div class="responsive-show" style="display: none;">
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
</div>
<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
<!-- IF .topicrow.pagination --> <!-- IF .topicrow.pagination -->
<div class="pagination"> <div class="pagination">
<ul> <ul>
@ -62,15 +69,11 @@
</ul> </ul>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="responsive-hide"> <div class="responsive-hide">
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
</div> </div>
<div class="responsive-show" style="display: none;">
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong>
</div>
</div> </div>
</dt> </dt>

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

@ -7,7 +7,7 @@
<ul class="dropdown-contents"> <ul class="dropdown-contents">
<li>{L_JUMP_TO_PAGE}{L_COLON}</li> <li>{L_JUMP_TO_PAGE}{L_COLON}</li>
<li class="page-jump-form"> <li class="page-jump-form">
<input type="text" name="page-number" maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" /> <input type="number" name="page-number" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" />
<input class="button2" value="{L_GO}" type="button" /> <input class="button2" value="{L_GO}" type="button" />
</li> </li>
</ul> </ul>

19
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -35,7 +35,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
<div class="action-bar top" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> <div class="action-bar top">
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
<div class="buttons"> <div class="buttons">
@ -150,6 +150,15 @@
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
<!-- IF not S_IS_BOT -->
<div class="responsive-show" style="display: none;">
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
</div>
<!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF -->
<!-- ENDIF -->
<!-- IF .topicrow.pagination --> <!-- IF .topicrow.pagination -->
<div class="pagination"> <div class="pagination">
<ul> <ul>
@ -164,19 +173,13 @@
</ul> </ul>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="responsive-hide"> <div class="responsive-hide">
<!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> <!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF -->
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
</div> </div>
<!-- IF not S_IS_BOT -->
<div class="responsive-show" style="display: none;">
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
<!-- IF topicrow.REPLIES --><br />{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong><!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- EVENT topiclist_row_append --> <!-- EVENT topiclist_row_append -->
</div> </div>

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

@ -436,7 +436,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
} }
.rtl dl.icon dt .list-inner { .rtl dl.icon dt .list-inner {
padding-left: 0; padding-left: 5px;
padding-right: 45px; /* Space for folder icon */ padding-right: 45px; /* Space for folder icon */
} }
@ -1018,10 +1018,10 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
/* Forums and topics lists /* Forums and topics lists
----------------------------------------*/ ----------------------------------------*/
.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt { .rtl ul.topiclist.forums dt {
margin-left: -250px; margin-left: -250px;
} }
.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner { .rtl ul.topiclist.forums dt .list-inner {
margin-left: 250px; margin-left: 250px;
} }
@ -1033,11 +1033,11 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) @media only screen and (max-width: 550px), only screen and (max-device-width: 550px)
{ {
.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt { .rtl ul.topiclist.forums dt {
margin-left: 0; margin-left: 0;
} }
.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner { .rtl ul.topiclist.forums dt .list-inner {
margin-left: 0; margin-left: 0;
} }
} }

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

@ -59,7 +59,7 @@ body {
font-size: 10px; font-size: 10px;
line-height: normal; line-height: normal;
margin: 0; margin: 0;
padding: 0; padding: 12px 0;
word-wrap: break-word; word-wrap: break-word;
} }
@ -177,7 +177,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
#wrap { #wrap {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 8px; border-radius: 8px;
margin: 12px auto; margin: 0 auto;
max-width: 1152px; max-width: 1152px;
min-width: 625px; min-width: 625px;
padding: 15px; padding: 15px;
@ -185,7 +185,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { @media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) {
#wrap { #wrap {
margin: 12px; margin: 0 12px;
} }
} }
@ -852,6 +852,10 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin: 4px 0; margin: 4px 0;
} }
.forabg + .action-bar {
margin-top: 2em;
}
.action-bar:after { .action-bar:after {
clear: both; clear: both;
content: ''; content: '';

4
phpBB/styles/prosilver/theme/forms.css
View file

@ -276,6 +276,10 @@ textarea.inputbox {
width: auto !important; width: auto !important;
} }
input[type="number"] {
-moz-padding-end: inherit;
}
input[type="search"] { input[type="search"] {
-webkit-appearance: textfield; -webkit-appearance: textfield;
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;

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

@ -12,6 +12,10 @@ html {
height: auto; height: auto;
} }
body {
padding: 0;
}
#wrap { #wrap {
border: none; border: none;
border-radius: 0; border-radius: 0;
@ -127,14 +131,14 @@ ul.topiclist dd.mark {
/* Forums and topics lists /* Forums and topics lists
----------------------------------------*/ ----------------------------------------*/
ul.topiclist.forums dt, ul.topiclist.topics dt { ul.topiclist.forums dt {
margin-right: -250px; margin-right: -250px;
} }
ul.topiclist.forums dt .list-inner, ul.topiclist.topics dt .list-inner { ul.topiclist.forums dt .list-inner {
margin-right: 250px; margin-right: 250px;
} }
ul.topiclist.forums dd.lastpost, ul.topiclist.topics dd.lastpost { ul.topiclist.forums dd.lastpost {
display: block; display: block;
} }
@ -159,15 +163,15 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn {
@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) @media only screen and (max-width: 550px), only screen and (max-device-width: 550px)
{ {
ul.topiclist.forums dt, ul.topiclist.topics dt { ul.topiclist.forums dt {
margin-right: 0; margin-right: 0;
} }
ul.topiclist.forums dt .list-inner, ul.topiclist.topics dt .list-inner { ul.topiclist.forums dt .list-inner {
margin-right: 0; margin-right: 0;
} }
ul.topiclist.forums dd.lastpost, ul.topiclist.topics dd.lastpost { ul.topiclist.forums dd.lastpost {
display: none; display: none;
} }
} }
@ -200,8 +204,8 @@ ul.topiclist li.row dt a.subforum {
margin: 5px 0 0; margin: 5px 0 0;
} }
.row .pagination > ul { .row .pagination .ellipsis + li {
margin-top: 0; display: none !important;
} }
/* Responsive tables /* Responsive tables