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

Proposed by Ronnie
Status: Merged
Merged at revision: 22
Proposed branch: lp:~ronnie.vd.c/ubuntu-nl-artwork/small-improvements
Merge into: lp:ubuntu-nl-artwork/light-smf-theme
Diff against target: 115 lines (+25/-3)
1 file modified
css/index.css (+25/-3)
To merge this branch: bzr merge lp:~ronnie.vd.c/ubuntu-nl-artwork/small-improvements
Reviewer Review Type Date Requested Status
Yordi de Graaf Pending
Review via email: mp+106516@code.launchpad.net
To post a comment you must log in.

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-05-06 18:53:36 +0000
+++ css/index.css 2012-05-20 10:52:19 +0000
@@ -120,6 +120,7 @@
120 font-weight: normal;120 font-weight: normal;
121 padding: 4px 16px;121 padding: 4px 16px;
122 text-shadow: 1px 1px 1px #b03910; /* DD4814 + 20% 000000 */122 text-shadow: 1px 1px 1px #b03910; /* DD4814 + 20% 000000 */
123 font-weight: bold;
123}124}
124.button_submit[name="cancel"],125.button_submit[name="cancel"],
125.button_submit[name="delete"],126.button_submit[name="delete"],
@@ -805,6 +806,8 @@
805h4.catbg, h4.catbg2 , h3.catbg , h3.catbg2 , .table_list tbody.header td.catbg806h4.catbg, h4.catbg2 , h3.catbg , h3.catbg2 , .table_list tbody.header td.catbg
806{807{
807 padding: 0 8px;808 padding: 0 8px;
809 text-transform: uppercase;
810 font-size: 1.1em;
808}811}
809h4.titlebg, h3.titlebg812h4.titlebg, h3.titlebg
810{813{
@@ -820,7 +823,6 @@
820 background: #DD4814 no-repeat 0 -160px;823 background: #DD4814 no-repeat 0 -160px;
821 height: 31px;824 height: 31px;
822 overflow: hidden;825 overflow: hidden;
823 margin-bottom: 1px;
824}826}
825div.title_bar827div.title_bar
826{828{
@@ -877,6 +879,7 @@
877 font-size: 0.95em;879 font-size: 0.95em;
878 border-bottom: 1px solid #fff;880 border-bottom: 1px solid #fff;
879 background-color: #DD4814;881 background-color: #DD4814;
882 text-transform: uppercase;
880}883}
881.table_grid tr.catbg th, .table_grid tr.titlebg th884.table_grid tr.catbg th, .table_grid tr.titlebg th
882{885{
@@ -931,6 +934,8 @@
931table.table_grid thead tr.catbg th934table.table_grid thead tr.catbg th
932{935{
933 white-space: nowrap;936 white-space: nowrap;
937 padding: 0;
938 text-align: left;
934}939}
935940
936/* table_grid styles for Profile > Show Permissions. */941/* table_grid styles for Profile > Show Permissions. */
@@ -968,6 +973,7 @@
968 background-color: #f7f7f7;973 background-color: #f7f7f7;
969 clear: both;974 clear: both;
970 padding: 8px;975 padding: 8px;
976 border: 1px solid #dfdfdf;
971}977}
972.roundframe dl, .roundframe dt, .roundframe p978.roundframe dl, .roundframe dt, .roundframe p
973{979{
@@ -989,6 +995,7 @@
989{995{
990 padding: 1em;996 padding: 1em;
991 border: none;997 border: none;
998 border: 1px solid #dfdfdf;
992}999}
993.content p1000.content p
994{1001{
@@ -1810,6 +1817,18 @@
1810 text-align: center;1817 text-align: center;
1811 width: 6%;1818 width: 6%;
1812}1819}
1820table.table_list .header
1821{
1822 border: 1px solid #dd4814;
1823}
1824table.table_list .content
1825{
1826 border: 1px solid #dfdfdf;
1827}
1828table.table_list .divider
1829{
1830 height: 24px;
1831}
18131832
1814/* Styles for the board index.1833/* Styles for the board index.
1815------------------------------------------------- */1834------------------------------------------------- */
@@ -2057,6 +2076,7 @@
2057}2076}
2058#poll .content2077#poll .content
2059{2078{
2079 overflow: hidden;
2060}2080}
2061h4#pollquestion2081h4#pollquestion
2062{2082{
@@ -2075,6 +2095,7 @@
2075#poll_options div.submitbutton2095#poll_options div.submitbutton
2076{2096{
2077 clear: both;2097 clear: both;
2098 float: left;
2078}2099}
20792100
2080/* Poll results */2101/* Poll results */
@@ -2120,7 +2141,8 @@
2120#poll_options p2141#poll_options p
2121{2142{
2122 margin: 0 16px;2143 margin: 0 16px;
2123 padding-bottom: 4px;2144 float: left;
2145 line-height: 24px;
2124}2146}
21252147
2126div#pollmoderation2148div#pollmoderation
@@ -2343,7 +2365,7 @@
2343 clear: right;2365 clear: right;
2344 background-color: #F7F7F7;2366 background-color: #F7F7F7;
2345 padding: 12px;2367 padding: 12px;
2346 border-top: 1px solid #dfdfdf;2368 border: 1px solid #dfdfdf;
2347}2369}
2348.inner2370.inner
2349{2371{

Subscribers

People subscribed via source and target branches