Last active
September 9, 2017 12:06
-
-
Save hanakin/a8752d5eeb03ec6a77291f52c6a53aa3 to your computer and use it in GitHub Desktop.
style changes diffs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css | |
index 5e9b4cfb2..70cfb83a7 100644 | |
--- a/phpBB/styles/prosilver/theme/bidi.css | |
+++ b/phpBB/styles/prosilver/theme/bidi.css | |
@@ -13,6 +13,10 @@ | |
text-align: left; | |
} | |
+.rtl p.jumpbox-return { | |
+ float: right; | |
+} | |
+ | |
.rtl div.rules ul { | |
margin-left: 0; | |
margin-right: 20px; | |
@@ -118,6 +122,11 @@ | |
float: left; | |
} | |
+.rtl .jumpbox .dropdown-contents a { | |
+ margin-right: 0; | |
+ margin-left: 20px; | |
+} | |
+ | |
/* Notifications | |
-----------------------------------------*/ | |
.rtl .notification_list ul li img { | |
@@ -261,11 +270,6 @@ | |
margin-right: 0; | |
} | |
-.rtl .topic-poster { | |
- float: right; | |
- padding-left: 0.5em; | |
-} | |
- | |
/* Action Bar styles | |
---------------------------------------- */ | |
.rtl .action-bar .button { | |
@@ -497,7 +501,6 @@ li.breadcrumbs span:first-child > a { | |
/* Quote block */ | |
.rtl blockquote { | |
margin: 0.5em 25px 0 1px; | |
- background-position: 99% 8px; | |
} | |
.rtl blockquote blockquote { | |
@@ -507,10 +510,13 @@ li.breadcrumbs span:first-child > a { | |
.rtl blockquote cite { | |
/* Username/source of quoter */ | |
- margin-right: 20px; | |
margin-left: 0; | |
} | |
+.rtl blockquote cite:before, .rtl .uncited:before { | |
+ padding-left: 5px; | |
+} | |
+ | |
.rtl blockquote .codebox { | |
margin-right: 0; | |
} | |
@@ -600,11 +606,12 @@ li.breadcrumbs span:first-child > a { | |
*/ | |
.rtl .caret { | |
- float: right; | |
+ border-right: 1px solid; | |
+ border-right-color: inherit; | |
+ border-left: none; | |
+ right: 6px; | |
} | |
- | |
- | |
/* Post control buttons | |
--------------------------------------------- */ | |
.rtl .post-buttons { | |
@@ -919,7 +926,8 @@ li.breadcrumbs span:first-child > a { | |
float: right; | |
} | |
-.button-search-end { | |
+.rtl .button-search-end { | |
+ border-radius: 4px 0 0 4px; | |
border-left-width: 1px; | |
border-right-width: 0; | |
} | |
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css | |
index cf21ac216..ffaa71034 100644 | |
--- a/phpBB/styles/prosilver/theme/colours.css | |
+++ b/phpBB/styles/prosilver/theme/colours.css | |
@@ -409,14 +409,9 @@ dl.faq dt { | |
/* Quote block */ | |
blockquote { | |
background-color: #EBEADD; | |
- background-image: url("./images/quote.gif"); | |
border-color:#DBDBCE; | |
} | |
-.rtl blockquote { | |
- background-image: url("./images/quote_rtl.gif"); | |
-} | |
- | |
blockquote blockquote { | |
/* Nested quotes */ | |
background-color:#EFEED9; | |
@@ -441,13 +436,6 @@ blockquote blockquote blockquote { | |
color: #2E8B57; | |
} | |
-.syntaxbg { color: #FFFFFF; } | |
-.syntaxcomment { color: #FF8000; } | |
-.syntaxdefault { color: #0000BB; } | |
-.syntaxhtml { color: #000000; } | |
-.syntaxkeyword { color: #007700; } | |
-.syntaxstring { color: #DD0000; } | |
- | |
/* Attachments | |
----------------------------------------*/ | |
.attachbox { | |
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css | |
index 4765230f6..ed2cc369b 100644 | |
--- a/phpBB/styles/prosilver/theme/common.css | |
+++ b/phpBB/styles/prosilver/theme/common.css | |
@@ -97,10 +97,18 @@ b, strong { | |
font-weight: bold; | |
} | |
+.text-strong { | |
+ font-weight: bold; | |
+} | |
+ | |
i, em { | |
font-style: italic; | |
} | |
+.text-italics { | |
+ font-style: italic; | |
+} | |
+ | |
u { | |
text-decoration: underline; | |
} | |
@@ -878,7 +886,7 @@ fieldset.fields1 dl.pmlist dd.recipients { | |
/* Pagination in viewforum for multipage topics */ | |
.row .pagination { | |
display: block; | |
- margin-top: 0.3em; | |
+ margin-top: -12px; | |
} | |
.row .pagination > ul { | |
@@ -891,12 +899,6 @@ fieldset.fields1 dl.pmlist dd.recipients { | |
font-size: 9px; | |
} | |
-.topic-poster { | |
- float: left; | |
- padding-right: 0.5em; | |
- margin-top: 0.3em; | |
-} | |
- | |
/* jQuery popups | |
---------------------------------------- */ | |
.phpbb_alert { | |
@@ -1248,7 +1250,7 @@ ul.linklist:after, | |
margin: 0 7px 0 0; | |
} | |
-.linklist.compact .rightside > a > span span { | |
+.linklist.compact .rightside > a > span { | |
display: none; | |
} | |
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css | |
index 53beee621..741056e4c 100644 | |
--- a/phpBB/styles/prosilver/theme/content.css | |
+++ b/phpBB/styles/prosilver/theme/content.css | |
@@ -134,15 +134,17 @@ li.header dl.row-item dt .list-inner { | |
dl.row-item { | |
background-position: 10px 50%; /* Position of folder icon */ | |
background-repeat: no-repeat; | |
+ background-size: 32px; | |
} | |
dl.row-item dt { | |
background-repeat: no-repeat; | |
background-position: 5px 95%; /* Position of topic icon */ | |
+ background-size: 17px; | |
} | |
dl.row-item dt .list-inner { | |
- padding-left: 45px; /* Space for folder icon */ | |
+ padding-left: 52px; /* Space for folder icon */ | |
} | |
dl.row-item dt, dl.row-item dd { | |
@@ -446,7 +448,6 @@ ul.searchresults { | |
----------------------------------------*/ | |
/* Quote block */ | |
blockquote { | |
- background: transparent none 6px 8px no-repeat; | |
border: 1px solid transparent; | |
font-size: 0.95em; | |
margin: 1em 1px 1em 25px; | |
@@ -464,7 +465,6 @@ blockquote cite { | |
/* Username/source of quoter */ | |
font-style: normal; | |
font-weight: bold; | |
- margin-left: 20px; | |
display: block; | |
font-size: 0.9em; | |
} | |
@@ -473,8 +473,8 @@ blockquote cite cite { | |
font-size: 1em; | |
} | |
-blockquote.uncited { | |
- padding-top: 25px; | |
+blockquote cite:before, .uncited:before { | |
+ padding-right: 5px; | |
} | |
blockquote cite > div { | |
@@ -489,16 +489,17 @@ blockquote cite > div { | |
/* Code block */ | |
.codebox { | |
- padding: 3px; | |
border: 1px solid transparent; | |
font-size: 1em; | |
margin: 1em 0 1.2em 0; | |
+ word-wrap: normal; | |
} | |
.codebox p { | |
text-transform: uppercase; | |
border-bottom: 1px solid transparent; | |
- margin-bottom: 3px; | |
+ margin-bottom: 0; | |
+ padding: 3px; | |
font-size: 0.8em !important; | |
font-weight: bold; | |
display: block; | |
@@ -513,10 +514,9 @@ blockquote .codebox { | |
display: block; | |
height: auto; | |
max-height: 200px; | |
- padding-top: 5px; | |
+ padding: 5px 3px; | |
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; | |
line-height: 1.3em; | |
- margin: 2px 0; | |
} | |
/* Attachments | |
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css | |
index e8efbc604..5646a7d6c 100644 | |
--- a/phpBB/styles/prosilver/theme/forms.css | |
+++ b/phpBB/styles/prosilver/theme/forms.css | |
@@ -267,11 +267,11 @@ fieldset.submit-buttons input { | |
resize: vertical; | |
outline: 3px dashed transparent; | |
outline-offset: -4px; | |
- -webkit-transition: all .5s ease; | |
- -moz-transition: all .5s ease; | |
- -ms-transition: all .5s ease; | |
- -o-transition: all .5s ease; | |
- transition: all .5s ease; | |
+ -webkit-transition: all .5s ease, height 1ms linear; | |
+ -moz-transition: all .5s ease, height 1ms linear; | |
+ -ms-transition: all .5s ease, height 1ms linear; | |
+ -o-transition: all .5s ease, height 1ms linear; | |
+ transition: all .5s ease, height 1ms linear; | |
} | |
/* Emoticons panel */ | |
@@ -310,7 +310,7 @@ textarea.inputbox { | |
} | |
input[type="number"] { | |
- -moz-padding-end: inherit; | |
+ -moz-padding-end: 0; | |
} | |
input[type="search"] { | |
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css | |
index 9fb7244f4..6643f12d0 100644 | |
--- a/phpBB/styles/prosilver/theme/icons.css | |
+++ b/phpBB/styles/prosilver/theme/icons.css | |
@@ -9,7 +9,7 @@ | |
* Just change the name of the font after the 14/1 to the name of | |
* the font you wish to use. | |
*/ | |
-.icon, .button .icon { | |
+.icon, .button .icon, blockquote cite:before, .uncited:before { | |
display: inline-block; | |
font-weight: normal; | |
font-style: normal; | |
@@ -54,6 +54,10 @@ | |
font-size: 16px; | |
} | |
+.arrow-left .icon { | |
+ float: left; | |
+} | |
+ | |
.arrow-left:hover .icon { | |
margin-left: -5px; | |
margin-right: 5px; | |
@@ -81,3 +85,12 @@ | |
line-height: .9; | |
height: 12px; | |
} | |
+ | |
+blockquote cite:before, .uncited:before { | |
+ content: '\f10d'; /* Font Awesome quote-left */ | |
+} | |
+ | |
+.rtl blockquote cite:before, .rtl .uncited:before { | |
+ content: '\f10e'; /* Font Awesome quote-right */ | |
+} | |
+ | |
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css | |
index 6da14c932..6a61e9a26 100644 | |
--- a/phpBB/styles/prosilver/theme/links.css | |
+++ b/phpBB/styles/prosilver/theme/links.css | |
@@ -89,6 +89,17 @@ a.lastsubject:hover { | |
text-decoration: underline; | |
} | |
+.row-item a:hover { | |
+ text-decoration: none | |
+} | |
+ | |
+.row-item .topictitle:hover, | |
+.row-item .subforum:hover, | |
+.row-item .username:hover, | |
+.row-item .username-coloured:hover { | |
+ text-decoration: underline; | |
+} | |
+ | |
/* Post body links */ | |
.postlink { | |
text-decoration: none; | |
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css | |
index a3295ac36..a83270b74 100644 | |
--- a/phpBB/styles/prosilver/theme/print.css | |
+++ b/phpBB/styles/prosilver/theme/print.css | |
@@ -137,3 +137,12 @@ div.spacer { clear: both; } | |
.skip_link { display: none; } | |
.codebox p { display: none; } | |
+ | |
+/* stylelint-disable declaration-property-unit-whitelist */ | |
+.emoji { | |
+ min-height: 18px; | |
+ min-width: 18px; | |
+ height: 1em; | |
+ width: 1em; | |
+} | |
+/* stylelint-enable declaration-property-unit-whitelist */ | |
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css | |
index d71fd142e..76033a5ce 100644 | |
--- a/phpBB/styles/prosilver/theme/responsive.css | |
+++ b/phpBB/styles/prosilver/theme/responsive.css | |
@@ -280,11 +280,6 @@ | |
margin: 5px 0 0; | |
} | |
- .row .pagination { | |
- margin-top: 2px; | |
- margin-bottom: 2px; | |
- } | |
- | |
.row .pagination .ellipsis + li { | |
display: none !important; | |
} | |
@@ -567,13 +562,11 @@ | |
@media (max-width: 850px) { | |
.postprofile { width: 28%; } | |
+ | |
+ | |
} | |
@media (min-width: 701px) and (max-width: 950px) { | |
- .row .pagination { | |
- margin-top: 2px; | |
- margin-bottom: 2px; | |
- } | |
ul.topiclist dt { | |
margin-right: -410px; | |
@@ -588,3 +581,11 @@ | |
} | |
} | |
+@media (max-width: 992px) { | |
+ .row .pagination { | |
+ text-align: left; | |
+ float: left; | |
+ margin-top: 4px; | |
+ margin-bottom: 4px; | |
+ } | |
+} | |
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css | |
index f235f6030..45eb5b6fc 100644 | |
--- a/phpBB/styles/prosilver/theme/stylesheet.css | |
+++ b/phpBB/styles/prosilver/theme/stylesheet.css | |
@@ -1,21 +1,21 @@ | |
/* phpBB3 Style Sheet | |
-------------------------------------------------------------- | |
- Style name: prosilver (the default phpBB 3.1.x style) | |
+ Style name: prosilver (the default phpBB 3.2.x style) | |
Based on style: | |
Original author: Tom Beddard ( http://www.subblue.com/ ) | |
Modified by: phpBB Limited ( https://www.phpbb.com/ ) | |
-------------------------------------------------------------- | |
*/ | |
-@import url("normalize.css"); | |
-@import url("base.css"); | |
-@import url("utilities.css"); | |
-@import url("common.css"); | |
-@import url("links.css"); | |
-@import url("content.css"); | |
-@import url("buttons.css"); | |
-@import url("cp.css"); | |
-@import url("forms.css"); | |
-@import url("icons.css"); | |
-@import url("colours.css"); | |
-@import url("responsive.css"); | |
+@import url("normalize.css?v=3.2"); | |
+@import url("base.css?v=3.2"); | |
+@import url("utilities.css?v=3.2"); | |
+@import url("common.css?v=3.2"); | |
+@import url("links.css?v=3.2"); | |
+@import url("content.css?v=3.2"); | |
+@import url("buttons.css?v=3.2"); | |
+@import url("cp.css?v=3.2"); | |
+@import url("forms.css?v=3.2"); | |
+@import url("icons.css?v=3.2"); | |
+@import url("colours.css?v=3.2"); | |
+@import url("responsive.css?v=3.2"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html | |
index 8c4e94109..940c0ace2 100644 | |
--- a/phpBB/styles/prosilver/template/bbcode.html | |
+++ b/phpBB/styles/prosilver/template/bbcode.html | |
@@ -53,13 +53,13 @@ | |
<!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open --> | |
<!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close --> | |
-<!-- BEGIN b_open --><strong><!-- END b_open --> | |
+<!-- BEGIN b_open --><strong class="text-strong"><!-- END b_open --> | |
<!-- BEGIN b_close --></strong><!-- END b_close --> | |
<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open --> | |
<!-- BEGIN u_close --></span><!-- END u_close --> | |
-<!-- BEGIN i_open --><em><!-- END i_open --> | |
+<!-- BEGIN i_open --><em class="text-italics"><!-- END i_open --> | |
<!-- BEGIN i_close --></em><!-- END i_close --> | |
<!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color --> | |
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html | |
index d1ec3dcef..a426d0884 100644 | |
--- a/phpBB/styles/prosilver/template/display_options.html | |
+++ b/phpBB/styles/prosilver/template/display_options.html | |
@@ -1,4 +1,4 @@ | |
-<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools"> | |
+<div class="dropdown-container dropdown-container-left dropdown-button-control sort-tools"> | |
<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select"> | |
<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i> | |
<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> | |
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html | |
index 0d6e930d6..621e22626 100644 | |
--- a/phpBB/styles/prosilver/template/forumlist_body.html | |
+++ b/phpBB/styles/prosilver/template/forumlist_body.html | |
@@ -52,10 +52,8 @@ | |
<!-- EVENT forumlist_body_subforums_before --> | |
<br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> | |
<!-- BEGIN subforum --> | |
- <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->"> | |
- <i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME} | |
- </a> | |
- <!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> | |
+ <!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->"> | |
+ <i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append --> | |
<!-- END subforum --> | |
<!-- EVENT forumlist_body_subforums_after --> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html | |
index ec5bf3547..b292c40eb 100644 | |
--- a/phpBB/styles/prosilver/template/index_body.html | |
+++ b/phpBB/styles/prosilver/template/index_body.html | |
@@ -40,13 +40,18 @@ | |
<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF --> | |
<p> | |
<!-- EVENT index_body_block_online_prepend --> | |
- {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST} | |
+ {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> | |
+ <!-- IF U_VIEWONLINE --> | |
+ <br />{LOGGED_IN_USER_LIST} | |
<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF --> | |
+ <!-- ENDIF --> | |
<!-- EVENT index_body_block_online_append --> | |
</p> | |
</div> | |
<!-- ENDIF --> | |
+<!-- EVENT index_body_birthday_block_before --> | |
+ | |
<!-- IF S_DISPLAY_BIRTHDAY_LIST --> | |
<div class="stat-block birthday-list"> | |
<h3>{L_BIRTHDAYS}</h3> | |
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html | |
index 724a96326..070efc0cb 100644 | |
--- a/phpBB/styles/prosilver/template/jumpbox.html | |
+++ b/phpBB/styles/prosilver/template/jumpbox.html | |
@@ -37,7 +37,7 @@ | |
<ul class="dropdown-contents"> | |
<!-- BEGIN jumpbox_forums --> | |
<!-- IF jumpbox_forums.FORUM_ID neq -1 --> | |
- <li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --> ↳ <!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> | |
+ <li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->↲<!-- ELSE -->↳<!-- ENDIF --> <!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> | |
<!-- ENDIF --> | |
<!-- END jumpbox_forums --> | |
</ul> | |
@@ -45,6 +45,6 @@ | |
</div> | |
<!-- ELSE --> | |
- </br></br> | |
+ <br /><br /> | |
<!-- ENDIF --> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html | |
index 97775814d..90793d072 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_front.html | |
+++ b/phpBB/styles/prosilver/template/mcp_front.html | |
@@ -30,7 +30,7 @@ | |
<dl> | |
<dt> | |
<div class="list-inner"> | |
- <a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> | |
+ <a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <!-- IF unapproved.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> | |
{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME} | |
</div> | |
</dt> | |
@@ -86,12 +86,12 @@ | |
<dl> | |
<dt> | |
<div class="list-inner"> | |
- <a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> | |
+ <a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <!-- IF report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> | |
<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}</span> | |
</div> | |
</dt> | |
<dd class="moderation"> | |
- <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> | |
+ <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <br /> | |
{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span> | |
</dd> | |
</dl> | |
@@ -129,7 +129,7 @@ | |
<dl> | |
<dt> | |
<div class="list-inner"> | |
- <a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> | |
+ <a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <!-- IF pm_report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> | |
<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}</span><br /> | |
<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html | |
index a0de554e2..af16c8ab8 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_post.html | |
+++ b/phpBB/styles/prosilver/template/mcp_post.html | |
@@ -294,6 +294,14 @@ | |
</tbody> | |
</table> | |
+ <div class="pagination"> | |
+ <!-- INCLUDE pagination.html --> | |
+ </div> | |
+ </div> | |
+ </div> | |
+ | |
+ <div class="panel"> | |
+ <div class="inner"> | |
<table class="table1"> | |
<thead> | |
<tr> | |
@@ -315,7 +323,27 @@ | |
</tbody> | |
</table> | |
+ <div class="buttons"> | |
<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p> | |
+ </div> | |
+ | |
+ <div class="pagination"> | |
+ <ul> | |
+ <!-- BEGIN pagination_ips --> | |
+ <!-- IF pagination_ips.S_IS_PREV --> | |
+ <li class="arrow previous"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> | |
+ <!-- ELSEIF pagination_ips.S_IS_CURRENT --> | |
+ <li class="active"><span>{pagination_ips.PAGE_NUMBER}</span></li> | |
+ <!-- ELSEIF pagination_ips.S_IS_ELLIPSIS --> | |
+ <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> | |
+ <!-- ELSEIF pagination_ips.S_IS_NEXT --> | |
+ <li class="arrow next"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> | |
+ <!-- ELSE --> | |
+ <li><a class="button" href="{pagination_ips.PAGE_URL}" role="button">{pagination_ips.PAGE_NUMBER}</a></li> | |
+ <!-- ENDIF --> | |
+ <!-- END pagination_ips --> | |
+ </ul> | |
+ </div> | |
</div> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html | |
index d64c9c9a2..35b1ecca0 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_topic.html | |
+++ b/phpBB/styles/prosilver/template/mcp_topic.html | |
@@ -111,7 +111,9 @@ | |
</li> | |
</ul> | |
+ <!-- EVENT mcp_topic_postrow_post_subject_before --> | |
<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3> | |
+ <!-- EVENT mcp_topic_postrow_post_subject_after --> | |
<!-- EVENT mcp_topic_postrow_post_details_before --> | |
<p class="author"> | |
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html | |
index 413c93f79..97a21f9a6 100644 | |
--- a/phpBB/styles/prosilver/template/overall_footer.html | |
+++ b/phpBB/styles/prosilver/template/overall_footer.html | |
@@ -76,7 +76,8 @@ | |
"content": { | |
"message": "{LA_COOKIE_CONSENT_MSG}", | |
"dismiss": "{LA_COOKIE_CONSENT_OK}", | |
- "link": "{LA_COOKIE_CONSENT_INFO}" | |
+ "link": "{LA_COOKIE_CONSENT_INFO}", | |
+ "href": "{LA_COOKIE_CONSENT_HREF}" | |
} | |
})}); | |
</script> | |
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html | |
index 4438137f7..09824d0a1 100644 | |
--- a/phpBB/styles/prosilver/template/overall_header.html | |
+++ b/phpBB/styles/prosilver/template/overall_header.html | |
@@ -33,7 +33,7 @@ | |
<script> | |
WebFontConfig = { | |
google: { | |
- families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic'] | |
+ families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese'] | |
} | |
}; | |
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html | |
index 78b0df84e..5d484517a 100644 | |
--- a/phpBB/styles/prosilver/template/pagination.html | |
+++ b/phpBB/styles/prosilver/template/pagination.html | |
@@ -16,13 +16,13 @@ | |
<!-- ENDIF --> | |
<!-- BEGIN pagination --> | |
<!-- IF pagination.S_IS_PREV --> | |
- <li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> | |
+ <li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> | |
<!-- ELSEIF pagination.S_IS_CURRENT --> | |
<li class="active"><span>{pagination.PAGE_NUMBER}</span></li> | |
<!-- ELSEIF pagination.S_IS_ELLIPSIS --> | |
<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> | |
<!-- ELSEIF pagination.S_IS_NEXT --> | |
- <li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> | |
+ <li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> | |
<!-- ELSE --> | |
<li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html | |
index f7114567e..997bc28b4 100644 | |
--- a/phpBB/styles/prosilver/template/search_results.html | |
+++ b/phpBB/styles/prosilver/template/search_results.html | |
@@ -78,7 +78,7 @@ | |
<!-- EVENT search_results_topic_before --> | |
<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> | |
<dl class="row-item {searchresults.TOPIC_IMG_STYLE}"> | |
- <dt<!-- IF searchresults.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> | |
+ <dt<!-- IF searchresults.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> | |
<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> | |
<div class="list-inner"> | |
<!-- EVENT topiclist_row_prepend --> | |
@@ -104,6 +104,7 @@ | |
</a> | |
<!-- ENDIF --> | |
<br /> | |
+ <!-- EVENT topiclist_row_topic_title_after --> | |
<!-- IF not S_IS_BOT --> | |
<div class="responsive-show" style="display: none;"> | |
@@ -134,7 +135,6 @@ | |
</ul> | |
</div> | |
<!-- ENDIF --> | |
- <!-- EVENT topiclist_row_topic_title_after --> | |
<!-- EVENT topiclist_row_append --> | |
</div> | |
@@ -185,6 +185,7 @@ | |
<dd class="search-result-date">{searchresults.POST_DATE}</dd> | |
<dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd> | |
<dd>{L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> | |
+ <!-- EVENT search_results_topic_title_after --> | |
<dd>{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></dd> | |
<dd>{L_VIEWS}{L_COLON} <strong>{searchresults.TOPIC_VIEWS}</strong></dd> | |
<!-- EVENT search_results_postprofile_after --> | |
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html | |
index 0e889b476..905d25096 100644 | |
--- a/phpBB/styles/prosilver/template/simple_header.html | |
+++ b/phpBB/styles/prosilver/template/simple_header.html | |
@@ -11,7 +11,7 @@ | |
<script> | |
WebFontConfig = { | |
google: { | |
- families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic'] | |
+ families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese'] | |
} | |
}; | |
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
index e2a086060..4295867c0 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
@@ -15,7 +15,7 @@ | |
<!-- ENDIF --> | |
<!-- IF U_VIEW_NEXT_HISTORY --> | |
<a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}"> | |
- <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_HISTORY}</span> | |
+ <i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_HISTORY}</span> | |
</a> | |
<!-- ENDIF --> | |
</fieldset> | |
@@ -179,7 +179,7 @@ | |
<!-- ENDIF --> | |
<!-- IF U_NEXT_PM --> | |
<a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}"> | |
- <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span> | |
+ <i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span> | |
</a> | |
<!-- ENDIF --> | |
<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html | |
index 7df57106e..b57f48ba1 100644 | |
--- a/phpBB/styles/prosilver/template/viewforum_body.html | |
+++ b/phpBB/styles/prosilver/template/viewforum_body.html | |
@@ -189,7 +189,9 @@ | |
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <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 --> | |
+ <!-- IF topicrow.REPLIES --> | |
+ <span class="responsive-show" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> | |
+ <!-- ENDIF --> | |
<!-- ENDIF --> | |
<div class="topic-poster responsive-hide"> | |
@@ -287,9 +289,9 @@ | |
<!-- INCLUDE jumpbox.html --> | |
-<!-- IF S_DISPLAY_ONLINE_LIST --> | |
+<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> | |
<div class="stat-block online-list"> | |
- <h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> | |
+ <h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> | |
<p>{LOGGED_IN_USER_LIST}</p> | |
</div> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html | |
index 522151cf7..71d364bbb 100644 | |
--- a/phpBB/styles/prosilver/template/viewtopic_body.html | |
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html | |
@@ -439,9 +439,9 @@ | |
<!-- EVENT viewtopic_body_footer_before --> | |
<!-- INCLUDE jumpbox.html --> | |
-<!-- IF S_DISPLAY_ONLINE_LIST --> | |
+<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> | |
<div class="stat-block online-list"> | |
- <h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> | |
+ <h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> | |
<p>{LOGGED_IN_USER_LIST}</p> | |
</div> | |
<!-- ENDIF --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js | |
index 1bb3aabb9..6903ad226 100644 | |
--- a/phpBB/styles/prosilver/template/ajax.js | |
+++ b/phpBB/styles/prosilver/template/ajax.js | |
@@ -26,7 +26,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) { | |
}); | |
// Mark subforums read | |
- $('a.subforum[class*="unread"]').removeClass('unread').addClass('read'); | |
+ $('a.subforum[class*="unread"]').removeClass('unread').addClass('read').children('.icon.icon-red').removeClass('icon-red').addClass('icon-blue'); | |
// Mark topics read if we are watching a category and showing active topics | |
if ($('#active_topics').length) { | |
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js | |
index b803a6f5c..3f59709ac 100644 | |
--- a/phpBB/styles/prosilver/template/forum_fn.js | |
+++ b/phpBB/styles/prosilver/template/forum_fn.js | |
@@ -57,7 +57,7 @@ function marklist(id, name, state) { | |
jQuery('#' + id + ' input[type=checkbox][name]').each(function() { | |
var $this = jQuery(this); | |
- if ($this.attr('name').substr(0, name.length) === name) { | |
+ if ($this.attr('name').substr(0, name.length) === name && !$this.prop('disabled')) { | |
$this.prop('checked', state); | |
} | |
}); | |
@@ -194,37 +194,6 @@ function selectCode(a) { | |
} | |
} | |
-/** | |
-* Play quicktime file by determining it's width/height | |
-* from the displayed rectangle area | |
-*/ | |
-function play_qt_file(obj) { | |
- 'use strict'; | |
- | |
- var rectangle = obj.GetRectangle(); | |
- var width, height; | |
- | |
- if (rectangle) { | |
- rectangle = rectangle.split(','); | |
- var x1 = parseInt(rectangle[0], 10); | |
- var x2 = parseInt(rectangle[2], 10); | |
- var y1 = parseInt(rectangle[1], 10); | |
- var y2 = parseInt(rectangle[3], 10); | |
- | |
- width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1; | |
- height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1; | |
- } else { | |
- width = 200; | |
- height = 0; | |
- } | |
- | |
- obj.width = width; | |
- obj.height = height + 16; | |
- | |
- obj.SetControllerVisible(true); | |
- obj.Play(); | |
-} | |
- | |
var inAutocomplete = false; | |
var lastKeyEntered = ''; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git diff release-3.2.0..release-3.2.1 -w -- phpBB/styles/prosilver/theme ':(exclude)phpBB/styles/prosilver/theme/images' > 3.2.0-3.2.1-css.diff | |
git diff release-3.2.0..release-3.2.1 -w -- phpBB/styles/prosilver/template/*.html > 3.2.0-3.2.1-html.diff | |
git diff release-3.2.0..release-3.2.1 -w -- phpBB/styles/prosilver/template/*.js > 3.2.0-3.2.1-js.diff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment