wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,290 Commits 8 Branches 0 Tags 330 MiB
9fe12be41e
Commit Graph

387 Commits

Author SHA1 Message Date
Sarven Capadisli
1a126032ef Adding clip illustration for notice attachments. 2009-06-05 12:33:46 -04:00
Sarven Capadisli
b708b81065 Init notice_data-attach UI for form_notice 2009-06-05 00:00:04 -04:00
Sarven Capadisli
c5d105f186 Fixed z-index for IE7 on attachment thumbnail 2009-06-01 17:12:41 +00:00
Sarven Capadisli
6981a708ae Cross-browser update for Design form labels 2009-05-30 19:43:31 +00:00
Sarven Capadisli
f56f2f52e7 Some cross-browser updates for conversation UI 2009-05-30 19:42:15 +00:00
Sarven Capadisli
b87aa46b3f Updated max-width for attachment overlay heading 2009-05-29 00:07:18 +00:00
Sarven Capadisli
60ac9bc6fd Bunch of UI fixes/improvements for attachments (hover, overlay, notice view, 
clip)
 2009-05-27 19:43:43 +00:00
Sarven Capadisli
0e8358bd23 Updated stylesheet paths for facebook app 2009-05-26 02:34:36 +00:00
Sarven Capadisli
aa935986b6 Removed unnecessary call to base/css/display.css for 0.8.x 2009-05-26 01:43:24 +00:00
Sarven Capadisli
3877324fd8 Updated JS to show/hide attachment thumbnails with timers. Minor 
markup changes.
 2009-05-25 17:30:57 -04:00
Sarven Capadisli
01dad57298 Markup cleanup for attachments 2009-05-25 15:53:19 -04:00
Sarven Capadisli
b229805861 Resetting some of the attachment styles. Will update in the next commit. 2009-05-25 15:02:28 -04:00
Robin Millette
84edf12791 Display thumbnail on hover over links in notices when appropriate. 2009-05-25 11:13:13 -04:00
Robin Millette
5f3acc2527 Removed big clip and replaced with smaller inline one next to each URL (in a notice) that's actually an attachment. Overlay (popup) on click. 2009-05-24 21:13:42 -04:00
Sarven Capadisli
07dabe7889 Made conversation thread UI a bit more visible. 
Added right margin for notice options.
 2009-05-24 21:16:26 +00:00
Robin Millette
b5ac6e31f2 Rearranged attachment info to only appear on each applicable notice page and thru an ajax popup. 2009-05-24 04:43:34 -04:00
Sarven Capadisli
69e88546fd Init styles for conversation page 2009-05-22 02:46:22 +00:00
Sarven Capadisli
56a8a255ff Changed No/Yes and Reset/Save locations. They are now a little more 
usable by first offering the option to undo and than do.
 2009-05-21 00:12:48 +00:00
Sarven Capadisli
0c442e459e Added reset button 
Rearranged swatch layout
Added background image upload input file
 2009-05-19 17:05:30 +00:00
Sarven Capadisli
da74a29e03 Using list-style-position:inside for lists so that bullets don't leak 
out of the container.

Added more padding to groups with most posts table
 2009-05-18 23:45:45 +00:00
Sarven Capadisli
8b5bcae58f Merge branch '0.7.x' into 0.8.x 
Conflicts:

	EVENTS.txt
 2009-05-18 23:28:08 +00:00
Sarven Capadisli
dcd69eec90 Increase entity_profile fn, nickname font-size slightly. Gave 
entity_profile more width.
 2009-05-18 23:23:00 +00:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Sarven Capadisli
51377258a1 Aligned shownotice page's entry-content to left. Fixing vcard photo 
margin bottom value.
 2009-05-02 00:10:50 +00:00
Sarven Capadisli
1fde80cf73 Minor CSS updates (No min-height on shownotice page, site_notice is 
floated instead of positioned absolutely, notice entry-content is
aligned with the nickname on shownotice page)
 2009-05-01 23:32:59 +00:00
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x 
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
 2009-05-01 00:16:25 +00:00
Sarven Capadisli
efe8c47d7d Minor CSS order/cleanup. 2009-04-27 20:07:22 +00:00
Sarven Capadisli
12867d114d UI for server errors. 2009-04-24 17:22:43 +00:00
Sarven Capadisli
64e4b8a20f Updated remaining files and styles for style separation for themes 2009-04-14 23:32:09 +00:00
Sarven Capadisli
7095c93f66 Simpler separation of themes. New themes can either make use of the 
default styles or make their own.
 2009-04-14 23:13:02 +00:00
Sarven Capadisli
d4f9f2c69b Moved layout styles to base stylesheet. 2009-04-13 17:26:12 +00:00
Sarven Capadisli
d62f69e592 Removing h1 from display in Profile page due to duplicate visibility 
of fn and nickname.
 2009-04-13 03:05:00 +00:00
Sarven Capadisli
7a00dc749d Updated styles for the Authrization subscription form inputs 2009-04-12 21:50:14 +00:00
Sarven Capadisli
030477b02a Separation of themes (i.e., layout, typography) and skins (i.e., background 
images, colours).

A theme can have multiple skins.

Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.

Both theme and skin will be set to 'default' if not set in
config.php.

This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.

Added Cloudy theme.
 2009-04-12 02:08:55 +00:00
Sarven Capadisli
1f33df4715 (Subjective) The dotted border style is less obtrusive (negative 
space) than the dotted border style. While present, the dotted blends
away better. Observing 1 + 1 = 3 or more principle.
 2009-04-11 22:29:13 +00:00
Meitar Moscovitz
6cdc2ff444 Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS. 2009-04-09 13:52:39 -04:00
Sarven Capadisli
070cd3533c Fixes the issue mentioned in commit 7fc90d5. Changed the margin value 
that's specific to the Inbox/Outbox page only.
 2009-04-08 20:54:37 +00:00
Sarven Capadisli
255841cbb7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-08 20:01:00 +00:00
Sarven Capadisli
1ac66b3996 Using 800px width and using document.title if no text is selected. 2009-04-08 19:59:59 +00:00
Meitar Moscovitz
7fc90d5c5c Remove extranneous bottom margins on label; fix Safari layout bug. 
This margin causes a layout bug in Safari whereby the Inbox and Outbox
pages have a notice form textarea that's too wide, causing it to slide
beneath the "Send" button on those pages. Removing this margin seems to
be completely innocuous in my tests, which covered Safari, Firefox,
Opera, and Internet Explorer 7. Can less be more? :)
 2009-04-08 15:26:27 -04:00
Sarven Capadisli
3d536300aa Minor update for 800px width viewport 2009-04-08 18:52:05 +00:00
Sarven Capadisli
a839daad2e HTML br is not needed. Using 'clear' in CSS instead. 2009-04-07 23:45:22 +00:00
Sarven Capadisli
658462ce85 Markup and styles for search help and errors 2009-04-07 21:02:47 +00:00
Sarven Capadisli
c42995e3a2 Minimum height for content and aside area. 2009-04-07 20:02:42 +00:00
Sarven Capadisli
36f73bffbc Better support for 800px ~ 1024px width viewport/screen resolutions. 2009-04-02 06:29:49 +00:00
Sarven Capadisli
431ac087a5 Hiding site name from presentation iff site logo exists. 2009-03-29 22:43:39 +00:00
Sarven Capadisli
90e5f01f8a Processing indicator (aka spinner thingy) for form_notice submits 2009-03-25 22:53:21 +00:00
Sarven Capadisli
a7d8f7197e Alignment of notice-options in IE6 2009-03-25 22:48:51 +00:00
Sarven Capadisli
a13bfa5848 Ticket http://laconi.ca/trac/ticket/1274 
Minimised form_notice markup by removing unordered lists. There is a minor CSS
rule reassignment done by changing the selectors. There is no visual
change in the final result.
 2009-03-25 18:16:20 +00:00
Sarven Capadisli
fadae96a74 Password recover and change form markup updated. 2009-03-22 20:21:32 +00:00
Evan Prodromou
e185c0395a Revert "trac #201 Add flowplayer to enable multimedia playback capability." 
This reverts commit 9c9b6790ce.

This code wasn't ready for release, so I've reverted it for now.

Conflicts:

	lib/action.php
	lib/util.php
 2009-03-12 00:13:28 -04:00
Sarven Capadisli
8b9e559167 Updated typography and layout 2009-03-02 00:06:29 +00:00
Sarven Capadisli
0a96edac9c Slightly toned down the text-shadow on navigation 2009-02-28 23:10:40 +00:00
Sarven Capadisli
240ea96921 Print stylesheet - Added license and cleanup 2009-02-24 05:09:23 +00:00
Sarven Capadisli
d30590de23 Print stylesheet 2009-02-24 04:31:31 +00:00
Sarven Capadisli
85694e3fa6 Minor positioning: using absolute right instead of left 2009-02-20 23:54:17 +00:00
Sarven Capadisli
8fc7f5204e Minor CSS cleanup. 2009-02-19 02:55:04 +00:00
Sarven Capadisli
2eb6a6a9b0 Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review 
Conflicts:

	lib/action.php
 2009-02-17 20:32:19 +00:00
Sarven Capadisli
6440f4cecd Removed transformation effects from h1-h6 (except in aside) 2009-02-16 22:39:57 +00:00
Robin Millette
9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Sarven Capadisli
3c8c0572ef Ticket 1172. Capitalizing first character of each word to uppercase 
instead of putting all characters to uppercase.
 2009-02-11 23:03:12 +00:00
Meitar Moscovitz
07c6537898 Style the notice form and notices to better avoid need to scroll around. 2009-02-12 00:34:18 +11:00
Meitar Moscovitz
c9e8b1e5c3 Add streamlined mobile device-friendly styles when enabled in config. 
A new mobile-specific style sheet is added and loaded only if the
`$config['site']['mobile']` configuration variable is set to true.
 2009-02-11 03:03:16 +11:00
Meitar Moscovitz
8ec312043f Add a link to the group search page from a user's own group list. 
I've seen a request or two pop up for this on the Laconica group on
Identica, and I'd personally like there to be a link to the search
page from my own groups listing, as I often find myself looking for
one and end up at my browser's address bar.
 2009-02-07 04:03:25 +11:00
Sarven Capadisli
ac23321a40 Added primary and secondary form actions. Fixed markup for 
form_notice_delete
 2009-02-06 06:27:04 +00:00
Sarven Capadisli
e5b075b912 Matching Facebook app UI to identi.ca. Fixed tabs, add to profile, 
widths, font-size, and some HTML markup.
 2009-02-05 04:54:42 +00:00
Sarven Capadisli
b43bdda312 Removing extra margin after .section .notice .author. 2009-02-04 18:18:25 +00:00
Sarven Capadisli
593d41f78b Using overflow:hidden for long strings that don't contain any 
whitespace. This is both a preventive measure for user content that is
abused (i.e., leaking text into other page components) and for
aesthetics (requested by @evan)
 2009-02-04 16:45:46 +00:00
Sarven Capadisli
8463d23397 http://laconi.ca/trac/ticket/1112 -- Removed only the author fn from 
display.
 2009-02-04 14:35:34 +00:00
Sarven Capadisli
9abfe1848a Ticket 1029 -- Atom feed icon. Also updated the RSS icon to PNG version. 2009-02-02 17:21:33 +00:00
Sarven Capadisli
99fba4932d Ticket 1044 -- Removed border-top, reduced padding, changed notice 
count from 6 to 5, removed nickname.
 2009-02-02 17:02:58 +00:00
Sarven Capadisli
5f004c0158 Added "Edit" entity_action. 
Updated theme files.
 2009-02-02 16:33:47 +00:00
Sarven Capadisli
4f1345620a Better cross-browser support for page and text zoom-in/out. 2009-02-02 14:14:14 +00:00
Sarven Capadisli
88eb8c924c Reduced width and realigned anon_notice 2009-02-01 19:34:11 +00:00
Sarven Capadisli
804dc7cdb9 Ticket 1071 - Set overflow:auto for long non-breaking strings. This is 
the most cross-browser safe method unless the string is broken into
chunks at the time of output from backend.
 2009-02-01 19:06:08 +00:00
Sarven Capadisli
add0b7f329 Resaved identica logo as transparent PNG24 in order to handle various 
background colours without having to explicitly apply anti-aliasing.

Updated colour information in identica theme.

Removed ie7 base stylesheet that's no longer required.

Added ie identica stylesheet to handle solid background colour for
 2009-02-01 18:04:56 +00:00
Sarven Capadisli
533f9933de Ticket #1060 -- Ability to wrap long .entity_profile .entity_fn 2009-02-01 06:28:16 +00:00
Sarven Capadisli
59e42b766e Ticket #1045 -- Added borders to all sides of the pagination anchor. 2009-02-01 05:08:36 +00:00
Sarven Capadisli
43509a3c17 Better colour contrast for major areas (background, sidebar, tabs) 2009-01-27 06:04:50 +00:00
Sarven Capadisli
af615c3eb4 Using entity_actions styles instead 2009-01-26 16:34:41 +00:00
Sarven Capadisli
b2e67db833 Facebook form_settings label style 2009-01-26 06:28:30 +00:00
Sarven Capadisli
ff22b095c8 Facebook guide style 2009-01-26 06:20:44 +00:00
Sarven Capadisli
68f5afd791 Minor facebook app style fixes 2009-01-26 06:01:24 +00:00
Sarven Capadisli
cf7908a971 M 2009-01-24 05:03:32 +00:00
Sarven Capadisli
1a0719ae6c filter tags styles 2009-01-24 04:56:04 +00:00
sarven
8e4f985e45 Minor 2009-01-24 03:45:44 +00:00
sarven
08030196ca new group markup in usergroups matching groups 2009-01-24 03:23:40 +00:00
sarven
0cdaf3e155 Invitation markup and style 2009-01-24 03:18:34 +00:00
sarven
4980f654a8 Notice search markup and style 2009-01-24 03:14:27 +00:00
sarven
18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
sarven
7fa5e22438 Twitter settings styles 2009-01-23 11:42:38 +00:00
sarven
8ebc19727a Cursor pointer for input.submit 2009-01-23 11:20:47 +00:00
sarven
c396b4d9ef Merge branch 'master' of ../trunk 2009-01-23 11:02:49 +00:00
sarven
65ecb9c452 Giving more avatars per line 2009-01-23 11:02:26 +00:00
Zach Copley
767c7d293d trac750 Better CSS file organization and linking fore the FB app 2009-01-23 10:51:49 +00:00
sarven
6bf25779fb Facebook app styles 2009-01-23 10:40:45 +00:00
sarven
67df25fdfd Cleaning 2009-01-23 10:33:55 +00:00
sarven
6c9bbdb561 openid markup and style 2009-01-23 08:52:04 +00:00
sarven
50b9f5f6c5 Minor 2009-01-23 08:19:00 +00:00
sarven
493b77b2e1 Minor 2009-01-23 06:49:14 +00:00
sarven
c97980b145 Missing closing li 2009-01-23 06:14:56 +00:00
sarven
500ed2f5eb Cleanup 2009-01-23 05:23:28 +00:00
sarven
e2afca803d Cleanup 2009-01-23 04:54:54 +00:00
sarven
fbe6aa703e Tag cloud font-size and line-height 2009-01-23 04:08:12 +00:00
sarven
8b7c71ac24 Reduced .aside .tag-cloud font-size 2009-01-23 03:51:35 +00:00
sarven
961c5af3ce Anonymous notice 2009-01-23 03:47:32 +00:00
sarven
6d8cee6545 form clear fix 2009-01-23 01:31:04 +00:00
sarven
135f00c51b tag user profile and form markup and style 2009-01-23 01:20:20 +00:00
sarven
f3bbc9863b Minor 2009-01-23 00:25:47 +00:00
sarven
2935e8c7ce Minor markup fix 2009-01-23 00:20:05 +00:00
sarven
e8e0c74f8a Reduced top and bottom notice whitespace. 
Reduced form notice textarea height.
 2009-01-22 22:48:20 +00:00
sarven
251551fee6 Group top post section and styles 2009-01-22 21:47:33 +00:00
sarven
f6f71ea0ee Minor 2009-01-22 21:07:11 +00:00
sarven
785ffd5b9b Populat notices and some css cleanup 2009-01-22 21:03:59 +00:00
sarven
9bab9ae078 Top posters section markup and stye 2009-01-22 20:39:13 +00:00
sarven
690273e20d notice stlye updates 2009-01-22 19:43:08 +00:00
sarven
32debdac66 Profile tag dt display inline and margin 2009-01-22 17:49:55 +00:00
sarven
ead1384650 .profile form.form_subscriptions_edit style 2009-01-22 16:57:37 +00:00
sarven
93925b8505 Mathching markup to user profilelist (entities) 2009-01-22 16:50:35 +00:00
Evan Prodromou
01e7859a81 Remove common code from Subscriptions, make tags link visible 2009-01-22 17:12:23 +01:00
sarven
a330bdac62 Moved nudge response from util.php to nudge.php 
Adjusted some CSS
 2009-01-22 06:33:38 +00:00
sarven
03117fe3e8 Cleanup.. some for IE and other for cascading 2009-01-22 04:35:22 +00:00
sarven
07b52e19be Minor cleanup for future groups_related 2009-01-22 00:12:16 +00:00
sarven
a57f12b06c selector name cleanup 2009-01-22 00:04:13 +00:00
sarven
d72706ce9d Changed to @class entity_profile from @id user_profile. 2009-01-21 23:33:52 +00:00
sarven
4b42c35269 General markup and style cleanup 2009-01-21 22:44:27 +00:00
sarven
41f74218f2 Profile avatar settings 2009-01-21 20:33:37 +00:00
sarven
ac1cc954ae form_password markup and style 2009-01-21 19:56:18 +00:00
sarven
fd6549e438 Hid dt 2009-01-21 18:37:02 +00:00
sarven
0b0f25ce93 Public tagcloud and tag cloud styles 2009-01-21 18:35:45 +00:00
sarven
27b627c094 Made user_actions styles more consistent 2009-01-21 06:54:17 +00:00
sarven
88297e7b24 Direct message markup and style 2009-01-21 03:38:50 +00:00
sarven
e9b9795eeb (dis)favor form method call fix 2009-01-21 02:52:16 +00:00
sarven
96e40e0649 profilelist markup and styles 2009-01-21 01:10:11 +00:00
sarven
caeb74c9a5 Styles for nested <li>s 2009-01-20 22:55:46 +00:00
sarven
b8c4d0cad6 p and ul style for doc pages 2009-01-20 22:50:51 +00:00
sarven
bb4a6a514b user_actions form markup and styling 2009-01-20 22:36:57 +00:00
sarven
9c43974d23 fn font-style normal 2009-01-20 20:46:45 +00:00
sarven
96dc058bfa Using nickname only for uid 2009-01-20 05:58:35 +00:00
sarven
93a5865b2b Bolding address fn for cases where there is no logo. 2009-01-19 18:24:30 +00:00
Evan Prodromou
12c475c101 Merge branch 'master' of /var/www/trunk 
Conflicts:

	actions/facebookhome.php
	actions/facebooksettings.php
 2009-01-19 13:35:17 +00:00
sarven
838502dfd9 timestamp anchor spacing for IE 2009-01-19 04:46:18 +00:00
sarven
6967e3ec86 Setting up a way to deal with different logo sizes. 2009-01-19 04:19:14 +00:00
sarven
2fb53cdae4 Cleaning styles 2009-01-19 03:54:46 +00:00
sarven
ea2e908bc0 More space for the counter 2009-01-19 03:20:41 +00:00
sarven
1a6d120f28 margin-bottom for global nav for more space 2009-01-19 03:16:50 +00:00
sarven
0b5f0f4faa Renamed form_datas to form_data 2009-01-19 03:09:13 +00:00
sarven
323432aec3 Facebook base and theme stylesheets. Copy of site display.css files 
for now.
 2009-01-19 01:48:04 +00:00
sarven
2637433093 text-shadow for local a 2009-01-19 01:04:22 +00:00
sarven
8f9762aab1 Cross-browser stuff 2009-01-19 00:48:12 +00:00
sarven
910bd33243 Minimal cross browser styling (mostly IE7). w00t! 2009-01-19 00:10:42 +00:00
sarven
6b23a9ed2f Disfavor markup/style 2009-01-18 21:34:57 +00:00
sarven
7749228f52 OpenID settings remove style 2009-01-18 21:22:31 +00:00
sarven
061de33e57 SMS settings markup and styles. Minor check with twitter settings form_datas 2009-01-18 21:14:47 +00:00
sarven
d46c2cc8a7 IM settings markup and style. 
Added confirmed/unconfirmed styles
 2009-01-18 20:36:50 +00:00
sarven
5da9511c31 Markup and styles for the Register page 2009-01-18 19:42:08 +00:00
sarven
00daeeba64 Reduced h1 font-size again 2009-01-18 16:06:12 +00:00
sarven
fbae208123 Display noned legend of the login fieldset. 2009-01-18 16:01:10 +00:00
sarven
4b1cc73a58 Favor/Disfavor form @class 
Created icon, and add style
JS selector change
Fixed return actions
 2009-01-18 03:12:39 +00:00
sarven
c1a247358d Outline for notice-option anchor 2009-01-18 02:34:30 +00:00
sarven
245f317bbd Tweaking notice div.entry-content which impacts notice-option input 2009-01-18 01:52:54 +00:00
sarven
ffb1bb1fbb notice div.entry-content notice-options styles 2009-01-18 01:14:14 +00:00
sarven
88c7da66f0 Minor cleanup for login style 2009-01-18 01:02:42 +00:00
sarven
620d0594fc Reusing @class form_settings 2009-01-18 00:58:43 +00:00
sarven
cb35bd6061 Reduced h1, legend font-size 2009-01-18 00:02:31 +00:00
sarven
0ecdd5363d Profile settings styles 2009-01-17 23:49:12 +00:00
sarven
e93807d0e4 Removed notice-options text labels :( 2009-01-17 20:48:09 +00:00
sarven
6cc3f78cf3 Typography update to input and anchors on div.entry-content and 
div.notice-options
 2009-01-17 20:06:56 +00:00
sarven
f28f1108a9 Opacity on notice div.entry-content and div.notice-options 2009-01-17 16:42:54 +00:00
sarven
05b00cc7df Login styles 2009-01-17 16:22:36 +00:00
sarven
1df4a38313 notice vcard url and a:visited style 2009-01-17 03:09:00 +00:00
sarven
607e65be81 Delete notice markup and styles 2009-01-17 02:32:13 +00:00
sarven
996eb1da4e site nav local views styles -- rgba background color 2009-01-17 02:13:02 +00:00
sarven
b2f16c5234 SMS form settings 2009-01-17 01:08:55 +00:00
sarven
b9fb70ee70 Markup clean up and styles 2009-01-17 00:46:33 +00:00
sarven
0a5125675b Updates to form styling 2009-01-17 00:01:53 +00:00
sarven
f46fd284e4 Update to forms and email settings 2009-01-16 23:41:46 +00:00
sarven
05b69a290d Removed : after username 2009-01-16 18:04:04 +00:00
sarven
8abf935186 .notice style update 2009-01-16 17:50:14 +00:00
sarven
1b625dcfd7 footer width 2009-01-16 16:07:19 +00:00
sarven
4549e577ac Updating Creative Commons text and image 2009-01-16 15:52:17 +00:00
sarven
0b8131deec Removed max-width:100% 2009-01-16 15:43:30 +00:00
sarven
944876181c NoticeOver styles 2009-01-16 04:50:44 +00:00
sarven
0322190607 Readjusted location and size for logo, form_notice, 
site_nav_global_primary
 2009-01-16 02:49:51 +00:00
sarven
07e84976c2 Changed from supplemental_primary to aside_primary 2009-01-15 22:02:58 +00:00
sarven
7bb074898f Up to date 2009-01-15 20:15:11 +00:00
sarven
caaf237de8 Base theme stylesheet includes layout, and typography information 
Identica theme stylesheet includes colour and background information
 2009-01-14 22:19:17 +00:00