Merge lp:~ronnie.vd.c/ubuntu-community-webthemes/django-table-style into lp:ubuntu-community-webthemes/light-django-theme

Proposed by Ronnie
Status: Merged
Approved by: Chris Johnston
Approved revision: 33
Merged at revision: 34
Proposed branch: lp:~ronnie.vd.c/ubuntu-community-webthemes/django-table-style
Merge into: lp:ubuntu-community-webthemes/light-django-theme
Diff against target: 127 lines (+59/-33)
2 files modified
media/css/default.css (+59/-0)
media/css/django_extras.css (+0/-33)
To merge this branch: bzr merge lp:~ronnie.vd.c/ubuntu-community-webthemes/django-table-style
Reviewer Review Type Date Requested Status
Ubuntu Community Web Themes Developers Pending
Review via email: mp+56763@code.launchpad.net

Description of the change

Added basic table styling

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
1=== modified file 'media/css/default.css'
2--- media/css/default.css 2011-03-14 19:11:05 +0000
3+++ media/css/default.css 2011-04-07 13:29:48 +0000
4@@ -185,6 +185,18 @@
5 font-style: italic
6 }
7
8+table.basic {
9+ font-size:0.75em;
10+ line-height:1.3333em; /* 16x0.75 =12 */
11+}
12+table.basic thead th, table.basic thead a {
13+ font-weight:bold;
14+}
15+
16+table.basic thead a , table.basic tfoot a {
17+ text-decoration:underline;
18+}
19+
20 #top-logo {
21 font-size: 0.875em;
22 /* 16x0.75 =12 */
23@@ -353,6 +365,21 @@
24 width: 620px;
25 }
26
27+table.basic {
28+ width:542px;
29+ text-align:left;
30+ padding:0 8px;
31+ margin:20px auto;
32+}
33+
34+table.basic.wide {
35+ width:100%;
36+}
37+
38+table.basic td, table.basic th {
39+ padding:4px 8px;
40+}
41+
42 #searchbox-container {
43 float: right;
44 margin: 0px 10px 5px 0px;
45@@ -742,6 +769,38 @@
46 padding: 1px 3px;
47 }
48
49+table.basic thead {
50+ background-color:#aea79f;
51+}
52+
53+table.basic tfoot, table.basic tr.subsection {
54+ background-color:#dfdcd9;
55+}
56+
57+table.basic tbody tr {
58+ border-bottom:1px dotted #cccccc;
59+}
60+
61+table.basic thead th {
62+ color:#ffffff;
63+}
64+
65+table.basic tfoot td, table.basic tbody td {
66+ color:#333333;
67+}
68+
69+table.basic thead a {
70+ color:#ffffff;
71+}
72+
73+table.basic tfoot a {
74+ color:#333333;
75+}
76+
77+table.basic tbody a {
78+ color:#dd4814;
79+}
80+
81 .showcase-caption {
82 background-color: #000;
83 background-color: rgba(0,0,0,0.4);
84
85=== modified file 'media/css/django_extras.css'
86--- media/css/django_extras.css 2010-09-30 16:24:11 +0000
87+++ media/css/django_extras.css 2011-04-07 13:29:48 +0000
88@@ -29,39 +29,6 @@
89 border: 1px solid #DD4814;
90 }
91
92-/* - Data Table Decoration [Django]
93---------------------------------------------------------------------------------------------------------
94- */
95-
96-.odd, tr.odd {
97- background-color: #F3F3F3
98-}
99-
100-.even, tr.even {
101- background-color: #FAFAFA
102-}
103-
104-TABLE.data_table {
105-
106-}
107-
108- TABLE.data_table TH {
109- font-size: 0.75em;
110- font-weight: bold;
111- padding: 5px;
112- text-align: center;
113- }
114-
115- TABLE.data_table TR {
116-
117- }
118-
119- TABLE.data_table TD {
120- font-size: 0.75em;
121- padding: 5px;
122- vertical-align: top;
123- }
124-
125 a {
126 color: #DD4814
127 }

Subscribers

People subscribed via source and target branches