Skip to content

Commit faef649

Browse files
marc1706marc1706
authored
Merge pull request #317 from VSEphpbb/updates
Small updates / fixes
2 parents c540973 + d19686e commit faef649

File tree

6 files changed

+141
-89
lines changed

6 files changed

+141
-89
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"extra": {
3939
"display-name": "Board Rules",
4040
"soft-require": {
41-
"phpbb/phpbb": ">=3.2.0,<3.3"
41+
"phpbb/phpbb": ">=3.2.0"
4242
},
4343
"version-check": {
4444
"host": "www.phpbb.com",

‎composer.lock‎

Lines changed: 13 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎styles/prosilver/template/boardrules_controller.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- INCLUDE overall_header.html -->
33

44
<!-- IF S_CATEGORIES -->
5-
<div id="boardrules-categories">
5+
<div class="boardrules-categories">
66
<div class="mini-panel">
77
<div class="inner">
88
<h3>{L_BOARDRULES_CATEGORIES}</h3>
9-
<ul class="menu">
9+
<ul class="boardrules-menu">
1010
<!-- BEGIN rules -->
1111
<!-- IF rules.S_IS_CATEGORY --><li><a href="#{rules.U_ANCHOR}">{rules.TITLE}</a></li><!-- ENDIF -->
1212
<!-- END rules -->
@@ -16,11 +16,11 @@ <h3>{L_BOARDRULES_CATEGORIES}</h3>
1616
</div>
1717
<!-- ENDIF -->
1818

19-
<div id="container">
19+
<div class="boardrules-container">
2020
<h2 class="boardrules-header">{L_BOARDRULES_HEADER}</h2>
2121
<div id="main" class="content">
2222
<p>{BOARDRULES_EXPLAIN}</p>
23-
<ol id="rules">
23+
<ol class="boardrules-rules">
2424
<!-- BEGIN rules -->
2525
<!-- IF rules.S_CLOSE_LIST -->
2626
</ol>

‎styles/prosilver/theme/boardrules_controller.css‎

Lines changed: 63 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
/* page layout */
6-
#container {
6+
.boardrules-container {
77
position: relative;
88
overflow: hidden;
99
}
@@ -16,98 +16,121 @@
1616

1717
.content ol {
1818
font-size: 1.2em;
19-
margin-left: 2em;
2019
line-height: 1.4em;
20+
margin-left: 2em;
2121
}
2222

2323
.rtl .content ol {
24-
margin-left: 0;
2524
margin-right: 2em;
25+
margin-left: 0;
2626
}
2727

28-
.content ol ol{ font-size: 1em; }
28+
.content ol ol {
29+
font-size: 1em;
30+
}
2931

3032
/* rules */
31-
#rules { padding-right: 50px; }
32-
#rules li { margin-bottom: 20px; }
33-
#rules ol { list-style: lower-alpha; }
34-
#rules ol li { margin-bottom: 5px; }
35-
#rules ol li.rule-item { padding-bottom: 5px; }
36-
#rules ol li.rule-item ul,
37-
#rules ol li.rule-item ol { margin: 1em 0 1em 3em; }
38-
#rules ol li ol { list-style: lower-roman; }
39-
40-
.rtl #rules {
33+
.boardrules-rules {
34+
padding-right: 50px;
35+
}
36+
37+
.boardrules-rules li {
38+
margin-bottom: 20px;
39+
}
40+
41+
.boardrules-rules ol {
42+
list-style: lower-alpha;
43+
}
44+
45+
.boardrules-rules ol li {
46+
margin-bottom: 5px;
47+
}
48+
49+
.boardrules-rules ol .rule-item {
50+
padding-bottom: 5px;
51+
}
52+
53+
.boardrules-rules ol .rule-item ul,
54+
.boardrules-rules ol .rule-item ol {
55+
margin: 1em 0 1em 3em;
56+
}
57+
58+
.boardrules-rules ol li ol {
59+
list-style: lower-roman;
60+
}
61+
62+
.rtl .boardrules-rules {
4163
padding-right: 0;
4264
padding-left: 50px;
4365
}
4466

45-
.rtl #rules ol li.rule-item ol {
46-
margin-left: 0;
67+
.rtl .boardrules-rules ol .rule-item ol {
4768
margin-right: 3em;
69+
margin-left: 0;
4870
}
4971

5072
/* rules sections mini panel */
51-
#boardrules-categories {
52-
width: 260px;
73+
.boardrules-categories {
5374
float: right;
75+
width: 260px;
5476
margin: 26px 0 30px 30px;
5577
}
5678

57-
.rtl #boardrules-categories {
79+
.rtl .boardrules-categories {
5880
float: left;
59-
margin-left: 0;
6081
margin-right: 30px;
82+
margin-left: 0;
6183
}
6284

6385
.mini-panel {
6486
background-color: #ebebeb;
65-
margin-bottom: 5px;
66-
padding: 5px 10px;
6787
-moz-border-radius: 7px;
6888
-webkit-border-radius: 7px;
6989
border-radius: 7px;
90+
margin-bottom: 5px;
91+
padding: 5px 10px;
7092
}
7193

7294
.mini-panel h3 {
73-
color: #333333;
7495
font-family: Verdana, Helvetica, Arial, sans-serif;
75-
margin: 5px 0 0 0;
96+
color: #333333;
97+
margin: 5px 0 0;
7698
}
7799

78-
ul.menu {
79-
border-top: 1px solid #FFFFFF;
100+
.boardrules-menu {
101+
border-top: 1px solid #ffffff;
80102
list-style: none;
81103
}
82104

83-
ul.menu li {
105+
.boardrules-menu li {
106+
border-bottom: 1px solid #cccccc;
84107
margin: 0;
85-
padding: 5px 0 4px 0;
86-
border-bottom: 1px solid #CCCCCC;
108+
padding: 5px 0 4px;
87109
}
88110

89-
ul.menu li:last-child { border-bottom: none; }
111+
.boardrules-menu li:last-child {
112+
border-bottom: none;
113+
}
90114

91115
/* rule highlighting */
92116
.highlight {
93-
color: #BC2A4D;
94117
font-weight: bold;
95-
background-color: #ECD5D8;
96-
padding: 3px 6px 0 6px;
118+
background-color: #ecd5d8;
119+
color: #bc2a4d;
120+
padding: 3px 6px 0;
97121
}
98122

99123
/* responsive design */
100-
@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
101-
{
102-
#boardrules-categories,
103-
.rtl #boardrules-categories {
104-
width: 100%;
105-
float: none;
124+
@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) {
125+
.boardrules-categories,
126+
.rtl .boardrules-categories {
106127
text-align: center;
128+
float: none;
129+
width: 100%;
107130
margin: 0;
108131
}
109132

110-
#container {
133+
.boardrules-container {
111134
width: 100%;
112135
margin: 0;
113136
}

‎styles/subsilver2/template/boardrules_controller.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- INCLUDE overall_header.html -->
33

44
<!-- IF S_CATEGORIES -->
5-
<div id="boardrules-categories">
5+
<div class="boardrules-categories">
66
<div class="mini-panel">
77
<div class="inner">
88
<h3>{L_BOARDRULES_CATEGORIES}</h3>
9-
<ul class="menu">
9+
<ul class="boardrules-menu">
1010
<!-- BEGIN rules -->
1111
<!-- IF rules.S_IS_CATEGORY --><li><a href="#{rules.U_ANCHOR}">{rules.TITLE}</a></li><!-- ENDIF -->
1212
<!-- END rules -->
@@ -16,11 +16,11 @@ <h3>{L_BOARDRULES_CATEGORIES}</h3>
1616
</div>
1717
<!-- ENDIF -->
1818

19-
<div id="container">
19+
<div class="boardrules-container">
2020
<h2 class="boardrules-header">{L_BOARDRULES_HEADER}</h2>
2121
<div id="main" class="postbody">
2222
<p>{BOARDRULES_EXPLAIN}</p>
23-
<ol id="rules">
23+
<ol class="boardrules-rules">
2424
<!-- BEGIN rules -->
2525
<!-- IF rules.S_CLOSE_LIST -->
2626
</ol>

0 commit comments

Comments
 (0)