Merge lp:~franku/widelands-website/forum_tables into lp:widelands-website

Proposed by kaputtnik on 2015-02-24
Status: Merged
Merged at revision: 385
Proposed branch: lp:~franku/widelands-website/forum_tables
Merge into: lp:widelands-website
Diff against target: 160 lines (+70/-31)
2 files modified
media/css/forum.css (+69/-30)
templates/footer.html (+1/-1)
To merge this branch: bzr merge lp:~franku/widelands-website/forum_tables
Reviewer Review Type Date Requested Status
SirVer 2015-02-24 Approve on 2015-02-25
Review via email: mp+250839@code.launchpad.net

Description of the change

This branch make some corrections to tables in the forum. See https://bugs.launchpad.net/widelands-website/+bug/1424758

+ "update copyright statement": https://bugs.launchpad.net/widelands-website/+bug/1408398

Additional i sorted forum.css, made some comments and cleanups.

To post a comment you must log in.
SirVer (sirver) :
review: Approve
SirVer (sirver) wrote :

And deployed :). Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'media/css/forum.css'
2--- media/css/forum.css 2012-05-04 19:07:35 +0000
3+++ media/css/forum.css 2015-02-24 20:33:04 +0000
4@@ -1,3 +1,14 @@
5+/*++++++++++++++++++*/
6+/* Forum pages */
7+/*------------------*/
8+/* Effects to all */
9+/* forum pages */
10+/*++++++++++++++++++*/
11+
12+/********************/
13+/* Base Forum table */
14+/********************/
15+
16 .forum {
17 border: none;
18 border-collapse: collapse;
19@@ -17,6 +28,10 @@
20 padding: 8px;
21 }
22
23+/********************/
24+/* Forums overviews */
25+/********************/
26+
27 .forumIcon {
28 width: 50px;
29 }
30@@ -33,6 +48,19 @@
31 text-align: right;
32 }
33
34+/******************/
35+/* Topic specific */
36+/******************/
37+
38+tr.spacer {
39+ height: 10px;
40+ border: none;
41+}
42+
43+/******************/
44+/* Author colummn */
45+/******************/
46+
47 .forum .author {
48 width: 140px;
49 text-align: center;
50@@ -40,25 +68,32 @@
51 vertical-align: top;
52 }
53
54-.forum .post {
55- vertical-align: top;
56-}
57-
58 .authorStats {
59 text-align: left;
60 font-size: 10px;
61 line-height: 12px;
62 }
63
64-tr.spacer {
65- height: 10px;
66- border: none;
67-}
68-
69-.post p {
70- margin: 0px;
71- margin-bottom: 8px;
72- padding: 0px;
73+/*****************/
74+/* Post colummn */
75+/*****************/
76+
77+a.permalink {
78+ width: 16px;
79+ height: 20px;
80+ background-image: url("../forum/img/permalink.png");
81+}
82+
83+a.permalink:hover {
84+ background-image: url("../forum/img/permalink_hover.png");
85+}
86+
87+.forum .post {
88+ vertical-align: top;
89+}
90+
91+div.blogEntry .post p {
92+ margin-bottom: 4px;
93 }
94
95 .post blockquote {
96@@ -71,6 +106,26 @@
97 margin: 4px;
98 }
99
100+.post table {
101+ margin-bottom: 1em;
102+ border-collapse: collapse;
103+}
104+
105+.post th {
106+ padding: 0 1em 0 1em;
107+ border: 1px solid black;
108+}
109+
110+.post td {
111+ padding: 0 1em 0 1em;
112+ border: 1px solid black;
113+}
114+
115+/*****************/
116+/* Edit/add Post */
117+/* related */
118+/*****************/
119+
120 .preview-box .content {
121 background-image: url("../img/black50.png");
122 border: 1px solid black;
123@@ -78,24 +133,8 @@
124 width: 98%;
125 }
126
127-.post-form #id_subject {
128- width: 40%;
129-}
130-.post-form #id_name {
131- width: 40%;
132-}
133 .post-form #id_body {
134 width: 98%;
135 max-width: 98%;
136 height: 150px;
137-}
138-
139-a.permalink {
140- width: 16px;
141- height: 20px;
142- background-image: url("../forum/img/permalink.png");
143-}
144-
145-a.permalink:hover {
146- background-image: url("../forum/img/permalink_hover.png");
147-}
148+}
149\ No newline at end of file
150
151=== modified file 'templates/footer.html'
152--- templates/footer.html 2013-06-12 06:25:52 +0000
153+++ templates/footer.html 2015-02-24 20:33:04 +0000
154@@ -7,5 +7,5 @@
155 {% endcomment %}
156
157 <div id="footer">
158- Copyright &copy; 2009 - 2013 By the Widelands Development Team
159+ Copyright &copy; 2009 - 2015 By the Widelands Development Team
160 </div>

Subscribers

People subscribed via source and target branches