Daniel Holbach has proposed merging lp:~dholbach/loco-directory/585851 into 
lp:loco-directory.

Requested reviews:
  loco-directory-dev (loco-directory-dev)
Related bugs:
  #585851 fix theming with new ubuntu.com design
  https://bugs.launchpad.net/bugs/585851

-- 
https://code.launchpad.net/~dholbach/loco-directory/585851/+merge/26062
Your team loco-directory-dev is requested to review the proposed merge of 
lp:~dholbach/loco-directory/585851 into lp:loco-directory.
=== added file 'loco_directory/media/TEMP'
--- loco_directory/media/TEMP	1970-01-01 00:00:00 +0000
+++ loco_directory/media/TEMP	2010-05-26 15:01:28 +0000
@@ -0,0 +1,25 @@
+These files are nicked temporarily:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Reason: https://bugs.launchpad.net/loco-directory/+bug/585851
+
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/favicon.ico
+  http://www.ubuntu.com/sites/all/themes/ninesixty/styles/framework/text.css?3
+  http://www.ubuntu.com/sites/all/themes/ninesixty/styles/framework/960.css?3
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/styles/classes.css?3
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/styles/ubuntu09.css?3
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/bg.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/body-bg.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/top.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/bottom.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/bullet-triangle.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/bullet-triangle-down.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/bullet-triangle2.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/logo.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/icon-search.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/mastheadbg.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/masthead-border-red.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/newsbox-top.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/newsbox-bottom.png
+  http://www.ubuntu.com/sites/all/themes/ubuntu09/images/feature-button-bg-jpg.png
+

=== added file 'loco_directory/media/css/960.css'
--- loco_directory/media/css/960.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/960.css	2010-05-26 15:01:28 +0000
@@ -0,0 +1,579 @@
+/* $Id: 960.css,v 1.1.2.1 2009/06/20 19:25:54 dvessel Exp $ */
+
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+
+  Modified for Drupal.
+*/
+
+/* `Containers
+----------------------------------------------------------------------------------------------------*/
+
+.container-12,
+.container-16 {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid-1,
+.grid-2,
+.grid-3,
+.grid-4,
+.grid-5,
+.grid-6,
+.grid-7,
+.grid-8,
+.grid-9,
+.grid-10,
+.grid-11,
+.grid-12,
+.grid-13,
+.grid-14,
+.grid-15,
+.grid-16 {
+  display: inline;
+  float: left;
+  position: relative;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.container-12 .grid-3,
+.container-16 .grid-4 {
+  width: 220px;
+}
+
+.container-12 .grid-6,
+.container-16 .grid-8 {
+  width: 460px;
+}
+
+.container-12 .grid-9,
+.container-16 .grid-12 {
+  width: 700px;
+}
+
+.container-12 .grid-12,
+.container-16 .grid-16 {
+  width: 940px;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-left: 0;
+}
+
+.omega {
+  margin-right: 0;
+}
+
+/* `Grid >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .grid-1 {
+  width: 60px;
+}
+
+.container-12 .grid-2 {
+  width: 140px;
+}
+
+.container-12 .grid-4 {
+  width: 300px;
+}
+
+.container-12 .grid-5 {
+  width: 380px;
+}
+
+.container-12 .grid-7 {
+  width: 540px;
+}
+
+.container-12 .grid-8 {
+  width: 620px;
+}
+
+.container-12 .grid-10 {
+  width: 780px;
+}
+
+.container-12 .grid-11 {
+  width: 860px;
+}
+
+/* `Grid >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-16 .grid-1 {
+  width: 40px;
+}
+
+.container-16 .grid-2 {
+  width: 100px;
+}
+
+.container-16 .grid-3 {
+  width: 160px;
+}
+
+.container-16 .grid-5 {
+  width: 280px;
+}
+
+.container-16 .grid-6 {
+  width: 340px;
+}
+
+.container-16 .grid-7 {
+  width: 400px;
+}
+
+.container-16 .grid-9 {
+  width: 520px;
+}
+
+.container-16 .grid-10 {
+  width: 580px;
+}
+
+.container-16 .grid-11 {
+  width: 640px;
+}
+
+.container-16 .grid-13 {
+  width: 760px;
+}
+
+.container-16 .grid-14 {
+  width: 820px;
+}
+
+.container-16 .grid-15 {
+  width: 880px;
+}
+
+/* `Prefix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .prefix-3,
+.container-16 .prefix-4 {
+  padding-left: 240px;
+}
+
+.container-12 .prefix-6,
+.container-16 .prefix-8 {
+  padding-left: 480px;
+}
+
+.container-12 .prefix-9,
+.container-16 .prefix-12 {
+  padding-left: 720px;
+}
+
+/* `Prefix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .prefix-1 {
+  padding-left: 80px;
+}
+
+.container-12 .prefix-2 {
+  padding-left: 160px;
+}
+
+.container-12 .prefix-4 {
+  padding-left: 320px;
+}
+
+.container-12 .prefix-5 {
+  padding-left: 400px;
+}
+
+.container-12 .prefix-7 {
+  padding-left: 560px;
+}
+
+.container-12 .prefix-8 {
+  padding-left: 640px;
+}
+
+.container-12 .prefix-10 {
+  padding-left: 800px;
+}
+
+.container-12 .prefix-11 {
+  padding-left: 880px;
+}
+
+/* `Prefix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-16 .prefix-1 {
+  padding-left: 60px;
+}
+
+.container-16 .prefix-2 {
+  padding-left: 120px;
+}
+
+.container-16 .prefix-3 {
+  padding-left: 180px;
+}
+
+.container-16 .prefix-5 {
+  padding-left: 300px;
+}
+
+.container-16 .prefix-6 {
+  padding-left: 360px;
+}
+
+.container-16 .prefix-7 {
+  padding-left: 420px;
+}
+
+.container-16 .prefix-9 {
+  padding-left: 540px;
+}
+
+.container-16 .prefix-10 {
+  padding-left: 600px;
+}
+
+.container-16 .prefix-11 {
+  padding-left: 660px;
+}
+
+.container-16 .prefix-13 {
+  padding-left: 780px;
+}
+
+.container-16 .prefix-14 {
+  padding-left: 840px;
+}
+
+.container-16 .prefix-15 {
+  padding-left: 900px;
+}
+
+/* `Suffix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .suffix-3,
+.container-16 .suffix-4 {
+  padding-right: 240px;
+}
+
+.container-12 .suffix-6,
+.container-16 .suffix-8 {
+  padding-right: 480px;
+}
+
+.container-12 .suffix-9,
+.container-16 .suffix-12 {
+  padding-right: 720px;
+}
+
+/* `Suffix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .suffix-1 {
+  padding-right: 80px;
+}
+
+.container-12 .suffix-2 {
+  padding-right: 160px;
+}
+
+.container-12 .suffix-4 {
+  padding-right: 320px;
+}
+
+.container-12 .suffix-5 {
+  padding-right: 400px;
+}
+
+.container-12 .suffix-7 {
+  padding-right: 560px;
+}
+
+.container-12 .suffix-8 {
+  padding-right: 640px;
+}
+
+.container-12 .suffix-10 {
+  padding-right: 800px;
+}
+
+.container-12 .suffix-11 {
+  padding-right: 880px;
+}
+
+/* `Suffix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-16 .suffix-1 {
+  padding-right: 60px;
+}
+
+.container-16 .suffix-2 {
+  padding-right: 120px;
+}
+
+.container-16 .suffix-3 {
+  padding-right: 180px;
+}
+
+.container-16 .suffix-5 {
+  padding-right: 300px;
+}
+
+.container-16 .suffix-6 {
+  padding-right: 360px;
+}
+
+.container-16 .suffix-7 {
+  padding-right: 420px;
+}
+
+.container-16 .suffix-9 {
+  padding-right: 540px;
+}
+
+.container-16 .suffix-10 {
+  padding-right: 600px;
+}
+
+.container-16 .suffix-11 {
+  padding-right: 660px;
+}
+
+.container-16 .suffix-13 {
+  padding-right: 780px;
+}
+
+.container-16 .suffix-14 {
+  padding-right: 840px;
+}
+
+.container-16 .suffix-15 {
+  padding-right: 900px;
+}
+
+/* `Push Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .push-3,
+.container-16 .push-4 {
+  left: 240px;
+}
+
+.container-12 .push-6,
+.container-16 .push-8 {
+  left: 480px;
+}
+
+.container-12 .push-9,
+.container-16 .push-12 {
+  left: 720px;
+}
+
+/* `Push Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .push-1 {
+  left: 80px;
+}
+
+.container-12 .push-2 {
+  left: 160px;
+}
+
+.container-12 .push-4 {
+  left: 320px;
+}
+
+.container-12 .push-5 {
+  left: 400px;
+}
+
+.container-12 .push-7 {
+  left: 560px;
+}
+
+.container-12 .push-8 {
+  left: 640px;
+}
+
+.container-12 .push-10 {
+  left: 800px;
+}
+
+.container-12 .push-11 {
+  left: 880px;
+}
+
+/* `Push Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-16 .push-1 {
+  left: 60px;
+}
+
+.container-16 .push-2 {
+  left: 120px;
+}
+
+.container-16 .push-3 {
+  left: 180px;
+}
+
+.container-16 .push-5 {
+  left: 300px;
+}
+
+.container-16 .push-6 {
+  left: 360px;
+}
+
+.container-16 .push-7 {
+  left: 420px;
+}
+
+.container-16 .push-9 {
+  left: 540px;
+}
+
+.container-16 .push-10 {
+  left: 600px;
+}
+
+.container-16 .push-11 {
+  left: 660px;
+}
+
+.container-16 .push-13 {
+  left: 780px;
+}
+
+.container-16 .push-14 {
+  left: 840px;
+}
+
+.container-16 .push-15 {
+  left: 900px;
+}
+
+/* `Pull Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .pull-3,
+.container-16 .pull-4 {
+  left: -240px;
+}
+
+.container-12 .pull-6,
+.container-16 .pull-8 {
+  left: -480px;
+}
+
+.container-12 .pull-9,
+.container-16 .pull-12 {
+  left: -720px;
+}
+
+/* `Pull Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-12 .pull-1 {
+  left: -80px;
+}
+
+.container-12 .pull-2 {
+  left: -160px;
+}
+
+.container-12 .pull-4 {
+  left: -320px;
+}
+
+.container-12 .pull-5 {
+  left: -400px;
+}
+
+.container-12 .pull-7 {
+  left: -560px;
+}
+
+.container-12 .pull-8 {
+  left: -640px;
+}
+
+.container-12 .pull-10 {
+  left: -800px;
+}
+
+.container-12 .pull-11 {
+  left: -880px;
+}
+
+/* `Pull Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-16 .pull-1 {
+  left: -60px;
+}
+
+.container-16 .pull-2 {
+  left: -120px;
+}
+
+.container-16 .pull-3 {
+  left: -180px;
+}
+
+.container-16 .pull-5 {
+  left: -300px;
+}
+
+.container-16 .pull-6 {
+  left: -360px;
+}
+
+.container-16 .pull-7 {
+  left: -420px;
+}
+
+.container-16 .pull-9 {
+  left: -540px;
+}
+
+.container-16 .pull-10 {
+  left: -600px;
+}
+
+.container-16 .pull-11 {
+  left: -660px;
+}
+
+.container-16 .pull-13 {
+  left: -780px;
+}
+
+.container-16 .pull-14 {
+  left: -840px;
+}
+
+.container-16 .pull-15 {
+  left: -900px;
+}

=== added file 'loco_directory/media/css/classes.css'
--- loco_directory/media/css/classes.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/classes.css	2010-05-26 15:01:28 +0000
@@ -0,0 +1,144 @@
+/* styles that are used by the wysiwyg and the site */
+body, * {
+	font-family: "Bitstream Vera Sans", "Lucida Grande", "Verdana", sans-serif;
+}
+tr, td {
+    vertical-align: top;
+}
+
+td {
+	padding: 5px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    color: #000000;
+    margin-top: 10px;
+    /* font-family: "MgOpen Moderna", "Lucida Sans", "Nimbus Sans L", "Trebuchet MS", "Trebuchet", sans-serif;
+    */
+}
+
+h1 {
+	font-size: 21px;
+}
+
+h2 {
+	font-size: 19px;
+}
+
+h3 {
+	font-size: 17px;
+}
+
+h4 {
+	font-size: 15px;
+}
+
+h5, h6 {
+	font-size: 13px;
+}
+
+dt {
+	font-weight: bold;
+}
+
+dd {
+	margin: 0 0 3px;
+	padding: 2px 0 3px;
+}
+
+.graybg {
+	background-color: #F6F5F0;
+}
+
+.sidebox {
+	margin: 0pt 0pt 10px 10px; 
+	padding: 10px; 
+	width: 220px; 
+	float: right; 
+	background-color: #eee;
+}
+.highlight {
+	background-color: #ffc;
+}
+
+.commandprompt {
+	display: block;
+	margin: 1.5em 0;
+	padding: 1em;
+	background-color: #333;
+	color: #fff;
+	font-family: monospace;
+}
+
+.quote, blockquote {
+	color: #666;
+	margin: 1.5em;
+}
+
+.redhighlight {
+
+}
+
+.brownhighlight {
+
+}
+
+.blackhighlight {
+
+}
+
+.noundies {
+	text-decoration: none;
+}
+
+.large {
+	font-size: 1.2em;
+	margin-bottom: 1.25em;
+}
+
+.small {
+	font-size: 0.8em;
+	line-height: 1.875em;
+	margin-bottom: 1.875em;
+}
+
+.tiny {
+	font-size: 0.7;
+	line-height: 2.125em;
+	margin-bottom: 2.125em;
+}
+
+.caps {
+	font-size: 1.2em;
+	font-variant: small-caps;
+	letter-spacing: 1px;
+	line-height: 1%;
+	text-transform: lowercase;
+}
+
+.quiet {
+	color: #666;
+}
+.lightbox {
+
+}
+
+.content td, #tinymce td {
+	padding: 8px;
+}
+
+.usn {
+        background-color: #eee;
+        padding: 0.75em 1.5em;
+        border: 1px solid #ddd;
+        font-family: monospace;
+        white-space: pre;
+}
+
+.odd, tr.odd {
+	background-color: #F3F3F3;
+}
+
+.even, tr.even {
+	background-color: #FAFAFA;
+}

=== added file 'loco_directory/media/css/text.css'
--- loco_directory/media/css/text.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/text.css	2010-05-26 15:01:28 +0000
@@ -0,0 +1,81 @@
+/* $Id: text.css,v 1.1 2009/01/31 21:28:46 dvessel Exp $ */
+
+/*
+  960 Grid System ~ Text CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+
+  Modifide for Drupal.
+*/
+
+/* `Basic HTML
+----------------------------------------------------------------------------------------------------*/
+
+body {
+  font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+}
+
+hr {
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px 0 0;
+  clear: both;
+  height: 0;
+}
+
+/* `Headings
+----------------------------------------------------------------------------------------------------*/
+
+h1 {
+  font-size: 25px;
+}
+
+h2 {
+  font-size: 23px;
+}
+
+h3 {
+  font-size: 21px;
+}
+
+h4 {
+  font-size: 19px;
+}
+
+h5 {
+  font-size: 17px;
+}
+
+h6 {
+  font-size: 15px;
+}
+
+/* `Spacing
+----------------------------------------------------------------------------------------------------*/
+
+ol {
+  list-style: decimal;
+}
+
+ul {
+  list-style: square;
+}
+
+p,
+dl,
+hr,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ol,
+ul,
+pre,
+table,
+address,
+fieldset {
+  margin-bottom: 20px;
+}

=== added file 'loco_directory/media/css/ubuntu09.css'
--- loco_directory/media/css/ubuntu09.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/ubuntu09.css	2010-05-26 15:01:28 +0000
@@ -0,0 +1,437 @@
+/* styles that need to be visible when editing via the wysiwyg should go into classes.css */
+
+body {
+	background: #d3caaa url('../images/bg.png') repeat-x;
+    color: black;
+}
+
+h1 {
+	font-size: 26px;
+}
+
+#main-content ol, ul {
+	margin-left: 20px;
+}
+
+#main-content ul ul, ul ol, ol ul, ol ol {
+	margin-bottom: 0;
+}
+
+#page {
+	background: #fff url('../images/body-bg.png') repeat-y;
+	margin-top: 15px;
+}
+
+#site-header {
+	background: url('../images/top.png') no-repeat top;
+	padding-top: 2px;
+	margin: 0;
+}
+
+#site-header, #site-subheader, #site-header .block, #ribbon .block {
+	margin-bottom: 0;
+}
+
+#ribbon .block {
+	background-color: #FFFF66;
+	padding: 4px;
+}
+
+#footer {
+	background: url('../images/bottom.png') no-repeat bottom;
+	padding-bottom: 25px;
+}
+
+#aboutmenu {
+    text-align: right;
+}
+#aboutmenu ul, #aboutmenu li {
+    display: inline;
+}
+
+#aboutmenu li:after {
+    content: " - ";
+}
+
+#aboutmenu li.last:after {
+    content: "";
+}
+.ubuntu09 .menu li.collapsed, .ubuntu09 .menu li.leaf {
+	list-style-image: url('../images/bullet-triangle.png');
+}
+
+.ubuntu09 .menu li.expanded {
+	list-style-image: url('../images/bullet-triangle-down.png');
+	padding-right: 0;
+}
+
+.ubuntu09 .menu .menu li.collapsed, .ubuntu09 .menu .menu li.leaf, .ubuntu09 .menu li.expanded li.expanded {
+	list-style-image: url('../images/bullet-triangle2.png');
+}
+
+.ubuntu09 .menu .menu {
+	background-color: #F0EEEB;
+	border-top: 1px dotted #656565;
+}
+
+.ubntu09 .menu li {
+	border-bottom: 1px dotted #656565;
+}
+
+.ubuntu09 .menu .menu li a {
+	text-decoration: none;
+	color: #474747;
+	background-color: #F0EEEB;
+}
+
+.ubuntu09 .menu .menu .menu {
+	border-top-style: none;
+}
+
+.ubuntu09 .menu .menu .menu li {
+	list-style-image: none;
+	list-style-type: none;
+	padding-left: 15px;
+	font-size: 87.5%;
+}
+#topNav {
+	width: 100%;
+	position: relative;
+	height: 80px;
+}
+#topNav a {
+	color: #656565;
+	text-decoration: none;
+	border-bottom: 1px dotted #fff;
+}
+#topNav li a:hover {
+	border-bottom: 1px dotted #656565;
+}
+#topNav ul {
+	display: block;
+	margin: 0;
+	padding: 0 0px .5em 0px;
+	position: absolute;
+	top: 10px;
+	right: 0px;
+	border-bottom: 1px solid #D6D6D6;
+}
+#topNav ul ul {
+	padding-bottom: 0;
+}
+#topNav li {
+	display: block;
+	float: left;
+	margin: 0 18px 0 0;
+	text-indent: 13px;
+	padding-bottom: 0;
+	background-image: url(../images/bullet-triangle.png);
+	background-repeat: no-repeat;
+	background-position: left center;
+	line-height: 1.1em;
+	position: relative;
+}
+#topNav li.last {
+	margin: 0;
+}
+#topNav li ul {
+	position: absolute;
+	background-color: #fff;
+	border: 1px solid #D3CAAA;
+	width: 10em;
+	left: -999em;
+	top: 1.1em;
+	z-index: 100;
+	font-size: 90%;
+}
+#topNav li:hover ul {
+	left: 0;
+	z-index: 1000;
+}
+#topNav li ul li {
+	background-image: none;
+	text-indent: 0;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+}
+#topNav li ul li a {
+	display: block;
+	width: 100%;
+	padding: .2em 0;
+	text-indent: .2em;
+}
+#topNav li ul li a:hover,#topNav li ul li a:active {
+	color: white;
+	background-color: #D3CAAA;
+}
+#topNav img {
+	margin: 0;
+	padding: 0;
+	border-style: none;
+}
+#topNav img.rule {
+	border-top: 1.7em solid white;
+	/* ugly, ugly, but the line is too close to the tabs w/out it
+ * 	   using ems means this lowers as the users font-size increases */
+}
+#ubuntulogo {
+	position: absolute;
+	top: 12px;
+	left: 0;
+	display: block;
+	width: 202px;
+	height: 55px;
+	background-image: url('../logo.png');
+	text-indent: -300px;
+}
+#searchbox {
+	width: 50%;
+	height: 25px;
+	text-align: right;
+/*	line-height: 60px; */
+	position: absolute;
+	top: 3.0em;
+	right: 9px;
+}
+#searchbox p {
+	line-height: 1.1em;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+#searchbox label {
+	display: none;
+}
+#searchbox button {
+	border-style: none;
+	background-color: #fff;
+	background-image: url(../images/icon-search.png);
+	width: 34px;
+	background-repeat: no-repeat;
+	background-position: bottom right;
+	height: 28px;
+}
+#searchbox button span {
+	display: block;
+	text-indent: -100px;
+	overflow: hidden;
+}
+#searchbox input {
+	border: 1px solid #C6C6C6;
+	color: #777;
+	font-size: 70%;
+	padding: 2px;
+}
+
+tbody {
+	border-top-style: none;
+}
+
+.content ul {
+	padding-left: 15px;
+}
+
+.content ul.menu {
+	padding-left: 0;
+}
+.ubuntu09 .menu li {
+	list-style-position: inside;
+}
+.ubuntu09 li .menu li {
+	padding-left: 8px;
+	border-bottom-style: none;
+}
+.ubuntu09 .menu a {
+	text-decoration: none;
+	color: #474747;
+}
+
+fieldset {
+	border: 1px solid #e8e8e8;
+}
+
+p, dl, hr, h1, h2, h3, h4, h5, h6, ol, ul, pre, table, address, fieldset {
+	margin-bottom: 12px;
+}
+
+li p, li {
+	margin-bottom: 6px;
+}
+/* header images */
+#masthead {
+        clear: both;
+        height: 95px;
+        background-image: url(../images/mastheadbg.png); 
+        background-repeat: repeat-x;
+        margin: 0;
+        padding: 0;
+        position: relative;
+        border-left: 204px solid #fff;
+        border-right: 216px solid #fff;
+        border-bottom: 10px solid #fff;
+        z-index: 1;
+}
+#mastheadimage {
+        position: absolute;
+        top: 0;
+        left: -204px;
+        z-index: 4;
+}
+#mastheadnotice {
+        width: 216px;
+        height: 95px;
+        position: absolute;
+        top: 0;
+        right: -216px;
+        z-index: 2;
+        background-image: url(../images/masthead-border-red.png);
+        background-repeat: no-repeat;
+        background-position: right top;
+        overflow:hidden;
+}
+#mastheadnotice h2 {
+        margin: 8px 8px 0 20px;
+        padding: 0;
+        color: #FFC547;
+        font-size: 100%;
+}
+#mastheadnotice p {
+        margin: 6px 8px 8px 20px;
+        margin-top: -1.4em; /* added for ubuntulive */
+        padding: 0;
+        color: white;
+        font-size: 70%;
+        font-weight: bold;
+        position: absolute;
+        height: 50%;
+        top: 25%;
+}
+#mastheadnotice a {
+        color: white;
+        font-weight: bold;
+        font-size: 110%;
+        text-decoration: none;
+}
+#mastheadcenter {
+        padding: 0;
+        margin: 0;
+        width: 100%;
+        overflow: hidden;
+        position: absolute;
+        bottom: 6px;
+        left: 0;
+	letter-spacing: 1.5px;
+}
+#mastheadcenter h1 {
+        margin: 0;
+        padding: 0 36px;
+/*        font-size: 150%; */
+	font-family: "MG Open Modata","Arial Rounded MT Bold","Futura", "Helvetica Neue",Arial;
+        color: #c00;
+}
+#mastheadcenter p {
+        font-size: 80%;
+        margin: 0;
+        padding: 0 .6em;
+        line-height: 1.4em;
+}
+/* end header/masthead images */
+
+#newsbox-homepage {
+padding-bottom:10px;
+padding-top:10px;
+position:relative;
+width:195px;
+}
+
+#newsbox-homepage-top {
+background-image:url(../images/newsbox-top.png);
+background-repeat:no-repeat;
+height:10px;
+left:0;
+position:absolute;
+top:0;
+width:195px;
+}
+
+#newsbox-homepage-bottom {
+background-image:url(../images/newsbox-bottom.png);
+background-repeat:no-repeat;
+bottom:0;
+height:10px;
+left:0;
+position:absolute;
+width:195px;
+}
+
+#newsbox-homepage p, #newsbox-homepage h3 {
+padding-left:15px;
+padding-right:15px;
+}
+
+#hotlinks_fancy {
+	margin: 1em 0;
+}
+#hotlinks_fancy div {
+	margin-bottom: 1em;
+	position: relative;
+	background-image: url(../images/feature-button-bg.jpg);
+	background-repeat: no-repeat;
+	background-position: bottom right; 
+	border-top: 1px solid white; /* needed to make ie6 behave */
+}
+#hotlinks_fancy div a {
+	color: #BD0901;
+	display: block;
+	margin-left: 52px;
+	text-decoration: none;
+}
+#hotlinks_fancy div img {
+	border-style: none;
+	position: absolute;
+	top: 0;
+	left: 4px;
+}
+#hotlinks_fancy div p {
+	margin: .5em 0 0 52px;
+	font-size: 90%;
+	padding-bottom: 1em;
+}
+#hotlinks_fancy div p a {
+	display: inline;
+	margin: 0;
+}
+#hotlinks {
+	margin: 2em 0;
+}
+#hotlinks div {
+	margin-bottom: 1em;
+	position: relative;
+	border-top: 1px solid white; /* needed to make ie6 behave */
+}
+#hotlinks div a {
+	color: #BD0901;
+	text-decoration: none;
+}
+#hotlinks div img {
+	border-style: none;
+	vertical-align: middle;
+}
+
+.toc {
+	width: 20em;
+	padding: 1em;
+	float: right;
+}
+
+.toc-title {
+	text-align: left;
+}
+.toc-toggle {
+	font-weight: normal;
+	text-decoration: none;
+}
+.clear {
+	clear: both; 
+}

=== added directory 'loco_directory/media/images'
=== added file 'loco_directory/media/images/bg.png'
Binary files loco_directory/media/images/bg.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/bg.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/body-bg.png'
Binary files loco_directory/media/images/body-bg.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/body-bg.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/bottom.png'
Binary files loco_directory/media/images/bottom.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/bottom.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/bullet-triangle-down.png'
Binary files loco_directory/media/images/bullet-triangle-down.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/bullet-triangle-down.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/bullet-triangle.png'
Binary files loco_directory/media/images/bullet-triangle.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/bullet-triangle.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/bullet-triangle2.png'
Binary files loco_directory/media/images/bullet-triangle2.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/bullet-triangle2.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/icon-search.png'
Binary files loco_directory/media/images/icon-search.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/icon-search.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/masthead-border-red.png'
Binary files loco_directory/media/images/masthead-border-red.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/masthead-border-red.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/mastheadbg.png'
Binary files loco_directory/media/images/mastheadbg.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/mastheadbg.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/newsbox-bottom.png'
Binary files loco_directory/media/images/newsbox-bottom.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/newsbox-bottom.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/newsbox-top.png'
Binary files loco_directory/media/images/newsbox-top.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/newsbox-top.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/images/top.png'
Binary files loco_directory/media/images/top.png	1970-01-01 00:00:00 +0000 and loco_directory/media/images/top.png	2010-05-26 15:01:28 +0000 differ
=== added file 'loco_directory/media/img/favicon.ico'
Binary files loco_directory/media/img/favicon.ico	1970-01-01 00:00:00 +0000 and loco_directory/media/img/favicon.ico	2010-05-26 15:01:28 +0000 differ
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-05-17 14:08:19 +0000
+++ loco_directory/templates/base.html	2010-05-26 15:01:28 +0000
@@ -5,12 +5,11 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <title>{% block title %} {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}</title>
-  <link rel="shortcut icon" href="http://www.ubuntu.com/sites/all/themes/ubuntu09/favicon.ico"; type="image/x-icon" /> 
-  <link type="text/css" rel="stylesheet" media="all" href="http://www.ubuntu.com/sites/all/themes/ninesixty/styles/framework/text.css?3"; /> 
-  <link type="text/css" rel="stylesheet" media="all" href="http://www.ubuntu.com/sites/all/themes/ninesixty/styles/framework/960.css?3"; /> 
-  <link type="text/css" rel="stylesheet" media="all" href="http://www.ubuntu.com/sites/all/themes/ubuntu09/styles/classes.css?3"; /> 
-  <link type="text/css" rel="stylesheet" media="all" href="http://www.ubuntu.com/sites/all/themes/ubuntu09/styles/ubuntu09.css?3"; /> 
-
+  <link rel="shortcut icon" href="/media/img/favicon.ico" type="image/x-icon" /> 
+  <style type="text/css" media="all">@import "/media/css/text.css";</style> 
+  <style type="text/css" media="all">@import "/media/css/960.css"; </style> 
+  <style type="text/css" media="all">@import "/media/css/classes.css";</style> 
+  <style type="text/css" media="all">@import "/media/css/ubuntu09.css";</style> 
   <style type="text/css" media="all">@import "/media/css/newstyle.css";</style>
 {% block initmap %}
   <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key={{ google_api_key }}" type="text/javascript"></script>

_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to