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
=== modified file 'css/index.css'
--- css/index.css 2012-02-23 13:07:21 +0000
+++ css/index.css 2012-02-24 12:44:25 +0000
@@ -113,7 +113,7 @@
113 cursor: pointer;113 cursor: pointer;
114 font-weight: normal;114 font-weight: normal;
115 padding: 4px 16px;115 padding: 4px 16px;
116 text-shadow: 1px 1px 1px #333;116 text-shadow: 1px 1px 1px #b03910;
117}117}
118input:hover, textarea:hover, button:hover, select:hover118input:hover, textarea:hover, button:hover, select:hover
119{119{
@@ -966,10 +966,7 @@
966------------------------------------------------------- */966------------------------------------------------------- */
967.content967.content
968{968{
969 padding: 0.5em 1.2em;
970 margin: 0;
971 border: none;969 border: none;
972 margin: 10px 0;
973}970}
974.content p971.content p
975{972{
@@ -1228,7 +1225,7 @@
1228 display: block;1225 display: block;
1229 font-size: 1.2em;1226 font-size: 1.2em;
1230 color: #333;1227 color: #333;
1231 background: #fff;1228 background-color: transparent;
1232 padding: 4px 8px;1229 padding: 4px 8px;
1233 margin-left: 8px;1230 margin-left: 8px;
1234 cursor: pointer;1231 cursor: pointer;
@@ -1964,26 +1961,25 @@
1964}1961}
1965#poll .content1962#poll .content
1966{1963{
1967 padding: 0 1em;
1968}1964}
1969h4#pollquestion1965h4#pollquestion
1970{1966{
1971 padding: 0 0 0.5em 2em;1967 padding: 0.5em 1em;
1972}1968}
19731969
1974/* Poll vote options */1970/* Poll vote options */
1975#poll_options ul.options1971#poll_options ul.options
1976{1972{
1977 border-top: 1px solid #9999aa;1973 border-top: 1px solid #dfdfdf;
1978 padding: 1em 2.5em 0 2em;1974 padding: 1em 1em 0;
1979 margin: 0 0 1em 0;1975 margin: 0 0 1em 0;
1980}1976}
1981#poll_options div.submitbutton1977#poll_options div.submitbutton
1982{1978{
1983 border-bottom: 1px solid #9999aa;1979 border-bottom: 1px solid #dfdfdf;
1984 clear: both;1980 clear: both;
1985 padding: 0 0 1em 2em;1981 padding: 0 0 12px 12px;
1986 margin: 0 0 1em 0;1982 margin: 0 0 12px 0;
1987}1983}
19881984
1989/* Poll results */1985/* Poll results */
@@ -1992,7 +1988,7 @@
1992 border: solid #9999aa;1988 border: solid #9999aa;
1993 border-width: 1px 0;1989 border-width: 1px 0;
1994 padding: 1em 2.5em 1em 2em;1990 padding: 1em 2.5em 1em 2em;
1995 margin: 0 1em 1em 0;1991 margin: 0 0 1em 0;
1996 line-height: 1.1em !important;1992 line-height: 1.1em !important;
1997}1993}
19981994
@@ -2029,8 +2025,8 @@
2029/* Poll notices */2025/* Poll notices */
2030#poll_options p2026#poll_options p
2031{2027{
2032 margin: 0 1.5em 0.2em 1.5em;2028 margin: 0 16px 12px;
2033 padding: 0 0.5em 0.5em 0.5em;2029 padding: 0 0 16px;
2034}2030}
20352031
2036div#pollmoderation2032div#pollmoderation
@@ -2038,6 +2034,14 @@
2038 margin: 0;2034 margin: 0;
2039 padding: 0;2035 padding: 0;
2040 overflow: auto;2036 overflow: auto;
2037 float: right;
2038 font-size: 0.8em;
2039 margin-top: -50px;
2040 margin-right: 8px;
2041}
2042div#pollmoderation a:hover
2043{
2044 background-color: #dfdfdf;
2041}2045}
20422046
2043/* onto the posts */2047/* onto the posts */
20442048
=== modified file 'images/bar_stats.png' (properties changed: +x to -x)
2045Binary files images/bar_stats.png 2011-09-25 17:23:29 +0000 and images/bar_stats.png 2012-02-24 12:44:25 +0000 differ2049Binary 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