Ubuntu NL Artwork

Merge lp:~ronnie.vd.c/ubuntu-nl-artwork/poll-widget into lp:ubuntu-nl-artwork/light-smf-theme

  1. poll-widget
  2. Merge into light-smf-theme-new
Proposed by Ronnie
Status: Merged
Merged at revision: 11
Proposed branch: lp:~ronnie.vd.c/ubuntu-nl-artwork/poll-widget
Merge into: lp:ubuntu-nl-artwork/light-smf-theme
Diff against target: 103 lines (+19/-15)
1 file modified
css/index.css (+19/-15)
To merge this branch: bzr merge lp:~ronnie.vd.c/ubuntu-nl-artwork/poll-widget
Reviewer Review Type Date Requested Status
Yordi de Graaf (community) Approve
Review via email: mp+94534@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yordi de Graaf (yddegraaf) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/index.css'
2--- css/index.css 2012-02-23 13:07:21 +0000
3+++ css/index.css 2012-02-24 12:44:25 +0000
4@@ -113,7 +113,7 @@
5 cursor: pointer;
6 font-weight: normal;
7 padding: 4px 16px;
8- text-shadow: 1px 1px 1px #333;
9+ text-shadow: 1px 1px 1px #b03910;
10 }
11 input:hover, textarea:hover, button:hover, select:hover
12 {
13@@ -966,10 +966,7 @@
14 ------------------------------------------------------- */
15 .content
16 {
17- padding: 0.5em 1.2em;
18- margin: 0;
19 border: none;
20- margin: 10px 0;
21 }
22 .content p
23 {
24@@ -1228,7 +1225,7 @@
25 display: block;
26 font-size: 1.2em;
27 color: #333;
28- background: #fff;
29+ background-color: transparent;
30 padding: 4px 8px;
31 margin-left: 8px;
32 cursor: pointer;
33@@ -1964,26 +1961,25 @@
34 }
35 #poll .content
36 {
37- padding: 0 1em;
38 }
39 h4#pollquestion
40 {
41- padding: 0 0 0.5em 2em;
42+ padding: 0.5em 1em;
43 }
44
45 /* Poll vote options */
46 #poll_options ul.options
47 {
48- border-top: 1px solid #9999aa;
49- padding: 1em 2.5em 0 2em;
50+ border-top: 1px solid #dfdfdf;
51+ padding: 1em 1em 0;
52 margin: 0 0 1em 0;
53 }
54 #poll_options div.submitbutton
55 {
56- border-bottom: 1px solid #9999aa;
57+ border-bottom: 1px solid #dfdfdf;
58 clear: both;
59- padding: 0 0 1em 2em;
60- margin: 0 0 1em 0;
61+ padding: 0 0 12px 12px;
62+ margin: 0 0 12px 0;
63 }
64
65 /* Poll results */
66@@ -1992,7 +1988,7 @@
67 border: solid #9999aa;
68 border-width: 1px 0;
69 padding: 1em 2.5em 1em 2em;
70- margin: 0 1em 1em 0;
71+ margin: 0 0 1em 0;
72 line-height: 1.1em !important;
73 }
74
75@@ -2029,8 +2025,8 @@
76 /* Poll notices */
77 #poll_options p
78 {
79- margin: 0 1.5em 0.2em 1.5em;
80- padding: 0 0.5em 0.5em 0.5em;
81+ margin: 0 16px 12px;
82+ padding: 0 0 16px;
83 }
84
85 div#pollmoderation
86@@ -2038,6 +2034,14 @@
87 margin: 0;
88 padding: 0;
89 overflow: auto;
90+ float: right;
91+ font-size: 0.8em;
92+ margin-top: -50px;
93+ margin-right: 8px;
94+}
95+div#pollmoderation a:hover
96+{
97+ background-color: #dfdfdf;
98 }
99
100 /* onto the posts */
101
102=== modified file 'images/bar_stats.png' (properties changed: +x to -x)
103Binary files images/bar_stats.png 2011-09-25 17:23:29 +0000 and images/bar_stats.png 2012-02-24 12:44:25 +0000 differ

Subscribers

People subscribed via source and target branches