Widelands Website

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

  1. forum_tables
  2. Merge into trunk
Proposed by kaputtnik
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 Approve
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.
Revision history for this message
SirVer (sirver) :
review: Approve
Revision history for this message
SirVer (sirver) wrote :

And deployed :). Thanks!

Preview Diff

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

Subscribers

People subscribed via source and target branches