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
=== modified file 'media/css/default.css'
--- media/css/default.css 2011-03-14 19:11:05 +0000
+++ media/css/default.css 2011-04-07 13:29:48 +0000
@@ -185,6 +185,18 @@
185 font-style: italic185 font-style: italic
186}186}
187187
188table.basic {
189 font-size:0.75em;
190 line-height:1.3333em; /* 16x0.75 =12 */
191}
192table.basic thead th, table.basic thead a {
193 font-weight:bold;
194}
195
196table.basic thead a , table.basic tfoot a {
197 text-decoration:underline;
198}
199
188#top-logo {200#top-logo {
189 font-size: 0.875em;201 font-size: 0.875em;
190 /* 16x0.75 =12 */202 /* 16x0.75 =12 */
@@ -353,6 +365,21 @@
353 width: 620px;365 width: 620px;
354}366}
355367
368table.basic {
369 width:542px;
370 text-align:left;
371 padding:0 8px;
372 margin:20px auto;
373}
374
375table.basic.wide {
376 width:100%;
377}
378
379table.basic td, table.basic th {
380 padding:4px 8px;
381}
382
356#searchbox-container {383#searchbox-container {
357 float: right;384 float: right;
358 margin: 0px 10px 5px 0px;385 margin: 0px 10px 5px 0px;
@@ -742,6 +769,38 @@
742 padding: 1px 3px;769 padding: 1px 3px;
743}770}
744771
772table.basic thead {
773 background-color:#aea79f;
774}
775
776table.basic tfoot, table.basic tr.subsection {
777 background-color:#dfdcd9;
778}
779
780table.basic tbody tr {
781 border-bottom:1px dotted #cccccc;
782}
783
784table.basic thead th {
785 color:#ffffff;
786}
787
788table.basic tfoot td, table.basic tbody td {
789 color:#333333;
790}
791
792table.basic thead a {
793 color:#ffffff;
794}
795
796table.basic tfoot a {
797 color:#333333;
798}
799
800table.basic tbody a {
801 color:#dd4814;
802}
803
745.showcase-caption {804.showcase-caption {
746 background-color: #000;805 background-color: #000;
747 background-color: rgba(0,0,0,0.4);806 background-color: rgba(0,0,0,0.4);
748807
=== modified file 'media/css/django_extras.css'
--- media/css/django_extras.css 2010-09-30 16:24:11 +0000
+++ media/css/django_extras.css 2011-04-07 13:29:48 +0000
@@ -29,39 +29,6 @@
29 border: 1px solid #DD4814;29 border: 1px solid #DD4814;
30}30}
3131
32/* - Data Table Decoration [Django]
33--------------------------------------------------------------------------------------------------------
34 */
35
36.odd, tr.odd {
37 background-color: #F3F3F3
38}
39
40.even, tr.even {
41 background-color: #FAFAFA
42}
43
44TABLE.data_table {
45
46}
47
48 TABLE.data_table TH {
49 font-size: 0.75em;
50 font-weight: bold;
51 padding: 5px;
52 text-align: center;
53 }
54
55 TABLE.data_table TR {
56
57 }
58
59 TABLE.data_table TD {
60 font-size: 0.75em;
61 padding: 5px;
62 vertical-align: top;
63 }
64
65a {32a {
66 color: #DD481433 color: #DD4814
67}34}

Subscribers

People subscribed via source and target branches