Merge lp:~mh0/ubuntu-drupal-theme/7.x into lp:ubuntu-drupal-theme

[Micheal Harker]

[Michael Lustfield (michaellustfield)]

This looks like you pushed the wrong branch. Look at the diff...

review: Needs Fixing

[lp:~mh0/ubuntu-drupal-theme/7.x]

9. By Micheal Harker <michealh@michealh-laptop> on 2010-11-30

Fixed header using margin: -9px auto 0;

10. By Micheal Harker <michealh@michealh-laptop> on 2010-11-30

Fixed issues

Unmerged revisions

10. By Micheal Harker <michealh@michealh-laptop> on 2010-11-30

Fixed issues

9. By Micheal Harker <michealh@michealh-laptop> on 2010-11-30

Fixed header using margin: -9px auto 0;

8. By Micheal Harker <michealh@michealh-laptop> on 2010-11-30

7.x changes for bug 632179

7. By Michael Lustfield on 2010-11-17

Fixed issue with some overflow being cut off.

6. By Michael Lustfield on 2010-11-17

Fixed minor bug with width options

5. By Michael Lustfield on 2010-11-17

Seems to be working- bug checking time.

4. By Michael Lustfield on 2010-11-16

Most CSS fixes dealt with

3. By Michael Lustfield on 2010-11-16

A lot of D7 transitional bugs knocked out. Mostly just CSS and review left.

2. By www-data <email address hidden> on 2010-11-16

Large chunk of changes for Making the theme work with Drupal 7.x - Getting pretty close.

1. By Michael Lustfield on 2010-11-15

Initial commit of module migration to Drupal 7.x. If it works perfect now, then no more commits. That is unlikely, however. :)

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2010-11-30 21:26:38 +0000
@@ -0,0 +1,125 @@
+=====================
+= Authors / History =
+=====================
+
+This theme came together because of the contributions of many people. You may
+find them in #ubuntu-drupal on irc.freenode.net. It was initially started by
+David Giard (swe3tdate) and later picked up by Michael Lustfield (MTecknology).
+It has since had many patches and contributions from many individuals. At its
+beginning, it was disliked by Canonical because it offered an exact clone of
+the Ubuntu website. Unknown to the authors, this also violated trademarks.
+Following the success of the project, Canonical began driving a community based
+theme that differed from the primary website but offered an unmistakable look
+and feel for community based projects. Because of the trademark policies, this
+theme does not adhere to the base theme provided but instead looks to only
+provide an easy means to include the base for community driven projects.
+
+IRC Nick	Name			Role
+MTecknology	Michael Lustfield	Primary Developer and Lead
+Ddorda		Dor Danker		RTL Theming
+Mongolito404	Pierre Buyle		Research and Support
+swe3tdave	David Giard		Previous Project Lead
+ilo		Inake Lopez		Previous Research
+lajjr		Leo Jackson		Previous Developer
+
+===================
+= Drop Down Menus =
+===================
+
+To enable drop down menus, simpley enable the nice_menus module. The theme will
+check for its existance and use it. It also checks for the deprecated version
+of the theme function if the newer version isn't available.
+
+Currently the theme will not work flawlessly with nice_menus. The 'last' class
+is not being applied which prevents the right sidebar from showing. This issue
+has been addressed in the development version of the module. When version 2 of
+the nice_menus module is released this issue will be resolved and compatibility
+will be removed. Until then, you can use the development version of the module
+and these issues will not apply to you.
+
+==========
+= Styles =
+==========
+
+The ability to easily modify the look of the theme exists. To do this:
+Navigate to: /admin/build/themes/settings/udtheme
+Choose the Color Set you wish to use
+Click "Save Configuration"
+
+=====================
+= GPL Compatibility =
+=====================
+
+Out of the box, this theme is to be 100% GPLv2 and GPLv3 compatible. This also
+means that no trademark policies may be violated. This is a particular concern
+for anyone using an Ubuntu driven theme. As stated in the above section, the
+pieces of the theme that violate trademark policy have been "popped" off to
+avoid conflicts with both GPL licenses and trademark policies.
+
+===============================
+= Including Restricted Pieces =
+===============================
+
+If you are building a website for an Ubuntu related project, then it is
+acceptable to include the parts that were popped off to maintain compatibility
+with other sections. This is only acceptable if your project is directly related
+to Ubuntu or one of its dirivatives.
+
+<note type="side">
+  The general rule of thumb is:
+  If you're directly affiliated with Ubuntu, you can mimic the site very closely
+    This theme will not do that
+  If you're site is related to the community, you can use the community styles
+    This theme enables this ability
+  If you're neither of the above, you need to maintain distinction
+    This theme does so by default
+</note>
+
+To include these popped off sections:
+Navigate to: /admin/build/themes/settings/udtheme
+Choose the Color Set "Official Ubuntu - see http://bit.ly/Hk4DA"
+Find "Theme-specific settings" -> "Ubuntu Affiliated"
+Select "Yes"
+Click "Save Configuration"
+
+Congratulations - your theme should now mimic the official Ubuntu light-base-theme.
+
+If you are not sure if you qualify for using these tweaks, please visit
+http://bit.ly/Hk4DA for details of acceptable use.
+
+==========
+= Issues =
+==========
+
+If you have an issue with the theme, please seek support.
+Questions: https://answers.launchpad.net/ubuntu-drupal-theme
+Bugs: https://bugs.launchpad.net/ubuntu-drupal-theme
+IRC: #ubuntu-drupal on Freenode
+Thank you for downloading the Ubuntu-Drupal theme.
+We've modified it to match the new Ubuntu branding introduced in 2010.
+
+Here are a few configuration options that are unique to this theme, or recommended.
+
+===================
+= Launchpad Login =
+===================
+
+Launchpad login is a convenient way for uses to log in using their existing Launchpad accounts:
+https://launchpad.net/drupal-launchpad
+https://code.launchpad.net/~canonical-isd-hackers/drupal-launchpad/6.x-trunk
+
+Once installed, this this theme has a special appearance for it when used in the
+subheader region, so go to admin > blocks and move "Launchpad Login Button" in
+the "Second Header" region.
+
+==========
+= Search =
+==========
+
+If you choose to have search functionality on your site, it is highly reccomended
+that you enable it by going to admin > themes > configure > ubuntu drupal theme
+then checkmarking the "Search box" in "Toggle display".
+
+Simply moving the search block to a region will not make this block nicely themed.
+
+This way the search box is specially themed in the header.

=== renamed file 'README' => 'README.moved'
=== added file 'favicon.ico'
Binary files favicon.ico	1970-01-01 00:00:00 +0000 and favicon.ico	2010-11-30 21:26:38 +0000 differ
=== renamed file 'favicon.ico' => 'favicon.ico.moved'
=== added directory 'images'
=== renamed directory 'images' => 'images.moved'
=== added file 'images/dotted.png'
Binary files images/dotted.png	1970-01-01 00:00:00 +0000 and images/dotted.png	2010-11-30 21:26:38 +0000 differ
=== added file 'images/footer.png'
Binary files images/footer.png	1970-01-01 00:00:00 +0000 and images/footer.png	2010-11-30 21:26:38 +0000 differ
=== added file 'images/header.png'
Binary files images/header.png	1970-01-01 00:00:00 +0000 and images/header.png	2010-11-30 21:26:38 +0000 differ
=== added file 'images/launchpad-logo.png'
Binary files images/launchpad-logo.png	1970-01-01 00:00:00 +0000 and images/launchpad-logo.png	2010-11-30 21:26:38 +0000 differ
=== added file 'images/mainnav.png'
Binary files images/mainnav.png	1970-01-01 00:00:00 +0000 and images/mainnav.png	2010-11-30 21:26:38 +0000 differ
=== added file 'logo.png'
Binary files logo.png	1970-01-01 00:00:00 +0000 and logo.png	2010-11-30 21:26:38 +0000 differ
=== renamed file 'logo.png' => 'logo.png.moved'
=== added file 'page.tpl.php'
--- page.tpl.php	1970-01-01 00:00:00 +0000
+++ page.tpl.php	2010-11-30 21:26:38 +0000
@@ -0,0 +1,73 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Core layout for every page
+ */
+
+?>
+
+<!-- Header -->
+<div id="header">
+  <div class="container" style="width:<?php print $pg_width; ?>;">
+    <?php print $menu; ?>
+    <?php print $logo; ?>
+    <?php print render($page['top_header']); ?>
+    <?php if ($page['search']) { ?>
+      <div class="block block-theme">
+        <?php print render($page['search']); ?>
+      </div>
+    <?php } ?>
+  </div>
+</div>
+
+<!-- Sub Header -->
+<?php if ($secondary_menu or $subheader) { ?>
+  <div id="subheader">
+    <div class="container" style="width: <?php print $pg_width; ?>;">
+      <div class="container-inside">
+        <?php print $submenu; ?>
+        <?php print render($page['subheader']); ?>
+      </div>
+    </div>
+  </div>
+<?php } ?>
+
+<!-- Content -->
+<div id="content">
+  <div class="container" style="width: <?php print $pg_width; ?>;">
+    <?php print render($page['above_content']);  ?>
+    <?php if ($show_messages) print $messages; ?>
+
+    <?php print (theme_get_setting('display_help')) ? render($page['help']) : NULL; ?>
+    <?php if ($page['left']) { ?>
+      <div id="sidebar-left" class="sidebar">
+      <?php print render($page['left']); ?>
+      </div>
+    <?php } ?>
+   <?php if ($page['right']) { ?>
+      <div id="sidebar-right" class="sidebar">
+        <?php print render($page['right']); ?>
+      </div>
+    <?php } ?>
+    <div id="center" <?php print udtheme_body_class($page['left'], $page['right']); ?>>
+      <?php print render($page['top_content']); ?>
+      <h1><?php print $title ?></h1>
+      <?php if ($tabs) print render($tabs); ?>
+      <?php print render($page['content']); ?>
+    </div>
+  </div>
+</div>
+
+<!-- Footer -->
+<?php if (theme_get_setting('ubuntu_footer')) { ?>
+  <div id="footer">
+    <div class="container" style="width: <?php print pagewidth(); ?>;">
+      <?php print udtheme_footer_text(); ?>
+      <?php print render($page['footer']); ?>
+    </div>
+  </div>
+<?php } else {
+  print render($page['footer']);
+} ?>

=== renamed file 'page.tpl.php' => 'page.tpl.php.moved'
=== added file 'screenshot.png'
Binary files screenshot.png	1970-01-01 00:00:00 +0000 and screenshot.png	2010-11-30 21:26:38 +0000 differ
=== renamed file 'screenshot.png' => 'screenshot.png.moved'
=== added directory 'styles'
=== renamed directory 'styles' => 'styles.moved'
=== added file 'styles/base-rtl.css'
--- styles/base-rtl.css	1970-01-01 00:00:00 +0000
+++ styles/base-rtl.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,150 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forums
+ */
+
+
+/**
+ * 1. Body
+ */
+
+
+/**
+ * 2. Header
+ */
+
+
+#header li {
+  float: right;
+  border-left: auto;
+}
+
+#header li.last {
+  border-right: auto;
+}
+
+#header li a {
+  float: right;
+}
+
+#header .block {
+  float: left;
+}
+
+#header #search .form-submit {
+  float: left;
+  padding: 5px 1px 0 3px;
+}
+
+#logo {
+  float: left;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader .block {
+  float: right;
+}
+
+#subheader .links {
+  float: right;
+}
+
+#subheader .form-submit {
+  margin: 7px 0 7px 9px;
+}
+
+#subheader .form-text {
+  margin: 7px 0 7px 9px;
+}
+
+#subheader .block-search {
+  float: left;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  padding-right: 22px;
+  padding-left: auto;
+}
+
+/**
+ * 4. Content
+ */
+
+#content .primary {
+  margin: 5px 0 0 0;
+}
+
+.submitted {
+  margin: 0 5px 0 0;
+}
+
+.comment h3 {
+  margin: 0 0 0 15px;
+  float: right;
+}
+
+.comment {
+  bottom-left: auto;
+}
+
+.new {
+  float: left;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .menu {
+  padding: 0 15px 0 0 !important;
+}
+
+.sidebar .menu a {
+  margin: 0 -4px 0 0;;
+}
+
+
+/**
+ * 6. Footer
+ */
+
+#footer .block {
+  float: right;
+}
+
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu ul {
+  border-right: auto;
+}
+
+#header ul.nice-menu li ul {
+  margin-right: 0px;
+}
+
+#header ul.nice-menu li ul li a {
+  padding: 0 10px 0 0;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/base.css'
--- styles/base.css	1970-01-01 00:00:00 +0000
+++ styles/base.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,426 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forums
+ */
+
+
+/**
+ * 1. Body
+ */
+
+* {
+  font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif;
+}
+
+body {
+  font-size: 12px;
+  line-height: 20px;
+  margin: 0;
+  padding: 0;
+}
+
+.container {
+  margin: 0 auto;
+  padding: 0;
+}
+
+/**
+ * 2. Header
+ */
+
+#header {
+  height: 70px;
+  margin: -9px auto 0;
+  padding: 0 5px;
+  position: relative;
+  font-size: 14px;
+
+}
+
+#header ul {
+  margin: 0;
+  padding: 0;
+}
+
+#header li {
+  float: left;
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+
+#header li a {
+  border-bottom: 0 none;
+  border-top: 0 none;
+  display: block;
+  float: left;
+  height: 70px;
+  line-height: 70px;
+  margin: 0;
+  padding: 0 15px;
+  text-decoration: none;
+}
+
+#header .block {
+  float: right;
+  margin: 20px 5px 0;
+}
+
+#header #search {
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  width: 150px;
+}
+
+#header #search * {
+  margin: 0;
+  padding: 0;
+  font-size: 10px !important;
+  font-weight: bold;
+  border: none;
+}
+
+#header #search .form-text {
+  padding: 2px 3px;
+}
+
+#header #search .form-submit {
+  cursor: pointer;
+  float: right;
+  padding: 5px 3px 0 1px;
+}
+
+#logo {
+  float: right;
+  margin: 11px 5px 0;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader {
+  height: 40px;
+}
+
+#subheader .container {
+  position: relative;
+  margin: -9px auto 0;
+  padding: 0 0 10px;
+}
+
+#subheader .container-inside {
+  width: 96%;
+  margin: 0 auto;
+  height: 39px;
+  position: relative;
+  border-radius: 0px 0px 8px 8px;
+  -moz-border-radius: 0px 0px 8px 8px;
+  -webkit-border-radius: 0px 0px 8px 8px;
+}
+
+#subheader .block {
+  float: left;
+  display: block;
+}
+
+#subheader .links {
+  float: left;
+  display: block;
+  padding: 0 10px;
+  margin: 0;
+}
+
+#subheader .links li {
+  padding: 0;
+}
+
+#subheader .links a {
+  float: left;
+  padding: 0 15px;
+  margin: 0;
+  line-height: 40px;
+  text-decoration: none;
+}
+
+#subheader h2 {
+  display: none;
+}
+
+#subheader .form-submit {
+  height: 24px;
+  margin: 7px 9px 7px 0;
+  padding: 2px;
+}
+
+#subheader .form-text {
+  height: 16px;
+  margin: 7px 9px 7px 0;
+  padding: 3px;
+  width: 180px;
+}
+
+#subheader .form-text:focus {
+}
+
+#subheader .block-search {
+  float: right;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border: none;
+  height: 20px;
+  padding-left: 22px;
+  cursor: pointer;
+}
+
+/**
+ * 4. Content
+ */
+
+#content {
+  line-height: 1.4em;
+}
+
+#content .container {
+  margin: -9px auto 0;
+  padding: 20px 0;
+}
+
+#page-content {
+  display: inline-block;
+  width: 100%;
+}
+
+#content .primary {
+  margin: 5px 0 0 0;
+}
+
+#content .primary a {
+  padding-top: 2px;
+  border-radius: 6px 6px 0px 0px;
+  -moz-border-radius: 6px 6px 0px 0px;
+  -webkit-border-radius: 6px 8px 0px 0px;
+}
+
+#content .block, .messages, .status {
+  padding: 10px;
+  margin-bottom: 10px;
+}
+
+#content .block h2 {
+  font-size: 18px;
+  margin: 0 0 8px;
+  font-weight: normal;
+}
+
+#content .block a {
+  font-size: 13px;
+  text-decoration: none;
+}
+
+h1 {
+  font-size: 34px;
+  font-weight: normal;
+  line-height: 36px;
+  margin: 6px 0 0 0;
+}
+
+#center {
+  overflow: hidden;
+}
+
+#center h2 a {
+  font-size: 28px;
+  font-weight: normal;
+  line-height: 34px;
+}
+
+#center h2 {
+  margin: 4px 0 0 0;
+}
+
+.submitted {
+  font-size: 11px;
+  margin: 0 0 0 5px;
+}
+
+.node {
+  padding: 4px 2px 8px 2px;
+}
+
+.comment h3 {
+  margin: 0 15px 0 0;
+  float: left;
+}
+
+.comment h3 a {
+  text-decoration: none;
+}
+
+.comment {
+  padding: 3px 8px 5px 8px;
+}
+
+.new {
+  float: right;
+}
+
+.node .links a, .comment .links a {
+  font-size: 11px;
+}
+
+.forum-topic-navigation {
+  height: 1.5em;
+}
+
+input, select {
+  vertical-align: middle;
+}
+
+.messages, .status {
+  font-size: 14px;
+  margin: 0 10px !important;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .block {
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+}
+
+.sidebar-right {
+  padding: 0 10px;
+}
+
+.sidebar-left {
+  padding: 0 10px;
+}
+
+.sidebars {
+  margin: 0 200px 0 200px;
+  padding: 0 10px;
+}
+
+.sidebar {
+  width: 200px;
+}
+
+.sidebar .block {
+  width: 170px !important;
+}
+
+#sidebar-right {
+  float: right;
+  padding: 10px;
+}
+
+#sidebar-left {
+  float: left;
+  padding: 10px;
+}
+
+.sidebar .menu {
+  padding: 0 0 0 15px !important;
+}
+
+.sidebar .block ul {
+  padding: 0;
+}
+
+.sidebar .menu li {
+  padding: 0;
+  margin: 0;
+  line-height: 1.2em;
+}
+
+.sidebar .menu a {
+  margin: 0 0 0 -4px;
+}
+
+.sidebar #user-login-form ul, .sidebar #user-login-form li {
+  padding: 0; margin: 0;
+  list-style-type:none;
+}
+
+/**
+ * 6. Footer
+ */
+
+#footer {
+  font-size: 11px;
+  width: 100%;
+  display: table;
+  margin: -9px auto 0;
+}
+
+#footer .block {
+  float: left;
+  margin: 5px 10px;
+  padding: 10px;
+  width: 120px;
+
+}
+
+#footer .block a {
+  display: block;
+  text-decoration: none;
+}
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu a, ul.nice-menu ul, ul.nice-menu li, ul.nice-menu-down,
+ul.nice-menu-down ul, ul.nice-menu-down li, ul.nice-menu li.menuparent,
+ul.nice-menu li.menuparent a, ul.nice-menu li.menuparent a:hover,
+ul.nice-menu li.menuparent:hover, ul.nice-menu li.menuparent:hover a {
+  border: 0;
+  padding:0;
+  margin: 0;
+}
+
+ul.nice-menu, ul.nice-menu ul {
+  position: absolute;
+}
+
+#header ul.nice-menu li ul {
+  margin-top: 44.8px;
+  margin-left: 0px;
+}
+
+#header ul.nice-menu li ul li {
+  height: 20px;
+  min-width: 100%;
+  width: 100%;
+  white-space: nowrap;
+}
+
+#header ul.nice-menu li ul li a {
+  height: 20px;
+  line-height: 20px;
+  width: 100%;
+  padding: 0 0 0 10px;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/classic-brown-rtl.css'
--- styles/classic-brown-rtl.css	1970-01-01 00:00:00 +0000
+++ styles/classic-brown-rtl.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,77 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+
+/**
+ * 2. Header
+ */
+
+
+#header li {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header li.last {
+  border-left: 1px solid #2F1C0F;
+}
+
+/**
+ * 3. Subheader
+ */
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-left: 1px solid #CCCCCC;
+  border-right: 1px solid #CCCCCC;
+}
+
+/**
+ * 4. Content
+ */
+
+.comment {
+  border-right: 1px dotted #CCCCCC;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+/**
+ * 6. Footer
+ */
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu ul {
+  border-left: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul {
+  border-left: 1px solid #2F1C0F;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/classic-brown.css'
--- styles/classic-brown.css	1970-01-01 00:00:00 +0000
+++ styles/classic-brown.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,245 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+* {
+  color: #000000;
+}
+
+body {
+  color: #333333;
+  background: #D3CAAA;
+}
+
+.container {
+  background: #FFFFFF;
+}
+
+/**
+ * 2. Header
+ */
+
+#header {
+  background: url("../images/header.png") repeat-x scroll 0 0 #796646;
+}
+
+#header li {
+  border-left: 1px solid #2F1C0F;
+}
+
+#header li.last {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header li a {
+  color: #FFFFFF;
+  text-shadow: 1px 1px 1px #333333;
+}
+
+#header li a.active, #header li a:hover {
+  background: url("../images/mainnav.png") repeat scroll 0 0 transparent;
+}
+
+#header #search {
+  border: 2px solid #4F3B14;
+  background: #FFFFFF;
+  box-shadow: inset #DFDFDF 2px 2px 2px;
+  -moz-box-shadow: inset #DFDFDF 2px 2px 2px;
+  -webkit-box-shadow: inset #DFDFDF 2px 2px 2px;
+}
+
+#header #search * {
+  color: #925B39;
+  background: transparent;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader {
+  background: url("../images/dotted.png") repeat scroll 0 0 #B1A585;
+}
+
+#subheader .container {
+}
+
+#subheader .container-inside {
+  background-color: #EEEEEE;
+  box-shadow: #DFDFDF 0 1px 1px;
+  -moz-box-shadow: #DFDFDF 0 1px 1px;
+  -webkit-box-shadow: #DFDFDF 0 1px 1px;
+}
+
+#subheader .links a:focus, #subheader .links a:hover,
+#subheader .links a:active, #subheader .links li.active a {
+  background-color: #EFEFEF;
+  color: #4F3B14;
+}
+
+#subheader .form-submit {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-submit:hover {
+  background-color:#f7f7f7;
+  border: 1px solid #4F3B14;
+}
+
+#subheader .form-text {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-text:focus {
+  background-color: #EEEEEE;
+  border: 1px solid #4F3B14;
+}
+
+#subheader .block-search {
+  float: right;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-right: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  background: url(../images/launchpad-logo.png) 4px 2px no-repeat;
+}
+
+/**
+ * 4. Content
+ */
+
+#content {
+  background: url("../images/dotted.png") repeat scroll 0 0 #B1A585;
+}
+
+#content .block h2 {
+  color: #3D273A;
+  border-bottom: dotted 1px #999999;
+}
+
+#content .block a {
+  color: #4F3B14;
+}
+
+h1 {
+  color: #2F1C0F;
+}
+
+#center h2 a {
+  color: #2F1C0F;
+}
+
+.submitted {
+  color: #777777;
+}
+
+.comment h3 a {
+  color: #3D273A;
+}
+
+.comment {
+  border-left: 1px dotted #CCCCCC;
+  border-bottom: 1px dotted #CCCCCC;
+}
+
+.new {
+  color: #555555;
+}
+
+.node .links a, .comment .links a {
+  color: #555555;
+}
+
+.messages, .status {
+  background: #EEEEEE;
+  color: #444444;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .block {
+  background:  #EEEEEE;
+  box-shadow: #DFDFDF 0 2px 2px;
+  -moz-box-shadow: #DFDFDF 0 2px 2px;
+  -webkit-box-shadow: #DFDFDF 0 2px 2px;
+}
+
+/**
+ * 6. Footer
+ */
+
+#footer {
+  background: url("../images/footer.png") repeat-x scroll 0 0 #D3CAAA;
+}
+
+#footer .block h2 {
+  color: #C31B1B;
+  font-size: 11px;
+  font-weight: normal;
+  margin: 0 0 9px;
+}
+
+#footer .block a {
+  border-bottom: dotted 1px #999999;
+}
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu a, ul.nice-menu ul, ul.nice-menu li, ul.nice-menu-down,
+ul.nice-menu-down ul, ul.nice-menu-down li, ul.nice-menu li.menuparent,
+ul.nice-menu li.menuparent a, ul.nice-menu li.menuparent a:hover,
+ul.nice-menu li.menuparent:hover, ul.nice-menu li.menuparent:hover a {
+  background-color: transparent;
+  background-image: none;
+}
+
+ul.nice-menu, ul.nice-menu ul {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul li {
+  background-color: #2F1C0F;
+}
+
+#header ul.nice-menu li ul li a {
+  background: none;
+  background-color: #796646;
+}
+
+#header ul.nice-menu li ul li a:hover {
+  background-image: url("../images/mainnav.png");
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/kimis-pink-rtl.css'
--- styles/kimis-pink-rtl.css	1970-01-01 00:00:00 +0000
+++ styles/kimis-pink-rtl.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,77 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+
+/**
+ * 2. Header
+ */
+
+
+#header li {
+  border-right: 1px solid #FC27B3;
+}
+
+#header li.last {
+  border-left: 1px solid #FC27B3;
+}
+
+/**
+ * 3. Subheader
+ */
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-left: 1px solid #CCCCCC;
+  border-right: 1px solid #CCCCCC;
+}
+
+/**
+ * 4. Content
+ */
+
+.comment {
+  border-right: 1px dotted #CCCCCC;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+/**
+ * 6. Footer
+ */
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu ul {
+  border-left: 1px solid #FF1866;
+}
+
+#header ul.nice-menu li ul {
+  border-left: 1px solid #FF1866;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/kimis-pink.css'
--- styles/kimis-pink.css	1970-01-01 00:00:00 +0000
+++ styles/kimis-pink.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,245 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+* {
+  color: #4B4A4C;
+}
+
+body {
+  color: #333333;
+  background: #FBEADC;
+}
+
+.container {
+  background: #FFFFFF;
+}
+
+/**
+ * 2. Header
+ */
+
+#header {
+  background: url("../images/header.png") repeat-x scroll 0 0 #CF307A;
+}
+
+#header li {
+  border-left: 1px solid #FF1866;
+}
+
+#header li.last {
+  border-right: 1px solid #FF1866;
+}
+
+#header li a {
+  color: #FFFFFF;
+  text-shadow: 1px 1px 1px #333333;
+}
+
+#header li a.active, #header li a:hover {
+  background: url("../images/mainnav.png") repeat scroll 0 0 transparent;
+}
+
+#header #search {
+  border: 2px solid #FF0041;
+  background: #FFFFFF;
+  box-shadow: inset #DFDFDF 2px 2px 2px;
+  -moz-box-shadow: inset #DFDFDF 2px 2px 2px;
+  -webkit-box-shadow: inset #DFDFDF 2px 2px 2px;
+}
+
+#header #search * {
+  color: #FF2F49;
+  background: transparent;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader {
+  background: url("../images/dotted.png") repeat scroll 0 0 #FBEADC;
+}
+
+#subheader .container {
+}
+
+#subheader .container-inside {
+  background-color: #F7F7F7;
+  box-shadow: #DFDFDF 0 1px 1px;
+  -moz-box-shadow: #DFDFDF 0 1px 1px;
+  -webkit-box-shadow: #DFDFDF 0 1px 1px;
+}
+
+#subheader .links a:focus, #subheader .links a:hover,
+#subheader .links a:active, #subheader .links li.active a {
+  background-color: #EFEFEF;
+  color: #FF696D;
+}
+
+#subheader .form-submit {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-submit:hover {
+  background-color:#f7f7f7;
+  border: 1px solid #FF696D;
+}
+
+#subheader .form-text {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-text:focus {
+  background-color: #F7F7F7;
+  border: 1px solid #FF696D;
+}
+
+#subheader .block-search {
+  float: right;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-right: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  background: url(../images/launchpad-logo.png) 4px 2px no-repeat;
+}
+
+/**
+ * 4. Content
+ */
+
+#content {
+  background: url("../images/dotted.png") repeat scroll 0 0 #FBEADC;
+}
+
+#content .block h2 {
+  color: #3D273A;
+  border-bottom: dotted 1px #999999;
+}
+
+#content .block a {
+  color: #111111;
+}
+
+h1 {
+  color: #FF1866;
+}
+
+#center h2 a {
+  color: #FF1866;
+}
+
+.submitted {
+  color: #777777;
+}
+
+.comment h3 a {
+  color: #3D273A;
+}
+
+.comment {
+  border-left: 1px dotted #CCCCCC;
+  border-bottom: 1px dotted #CCCCCC;
+}
+
+.new {
+  color: #555555;
+}
+
+.node .links a, .comment .links a {
+  color: #555555;
+}
+
+.messages, .status {
+  background: #F8F8F8;
+  color: #444444;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .block {
+  background:  #F8F8F8;
+  box-shadow: #DFDFDF 0 2px 2px;
+  -moz-box-shadow: #DFDFDF 0 2px 2px;
+  -webkit-box-shadow: #DFDFDF 0 2px 2px;
+}
+
+/**
+ * 6. Footer
+ */
+
+#footer {
+  background: url("../images/footer.png") repeat-x scroll 0 0 #FFE1EF;
+}
+
+#footer .block h2 {
+  font-size: 11px;
+  font-weight: normal;
+  margin: 0 0 9px;
+  color: #6B002E;
+}
+
+#footer .block a {
+  border-bottom: dotted 1px #999999;
+}
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu a, ul.nice-menu ul, ul.nice-menu li, ul.nice-menu-down,
+ul.nice-menu-down ul, ul.nice-menu-down li, ul.nice-menu li.menuparent,
+ul.nice-menu li.menuparent a, ul.nice-menu li.menuparent a:hover,
+ul.nice-menu li.menuparent:hover, ul.nice-menu li.menuparent:hover a {
+  background-color: transparent;
+  background-image: none;
+}
+
+ul.nice-menu, ul.nice-menu ul {
+  border-right: 1px solid #FF1866
+}
+
+#header ul.nice-menu li ul {
+  border-right: 1px solid #FF1866
+}
+
+#header ul.nice-menu li ul li {
+  background-color: #FF1866;
+}
+
+#header ul.nice-menu li ul li a {
+  background: none;
+  background-color: #CE307B;
+}
+
+#header ul.nice-menu li ul li a:hover {
+  background-image: url("../images/mainnav.png");
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/majan-blue-rtl.css'
--- styles/majan-blue-rtl.css	1970-01-01 00:00:00 +0000
+++ styles/majan-blue-rtl.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,77 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+
+/**
+ * 2. Header
+ */
+
+
+#header li {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header li.last {
+  border-left: 1px solid #2F1C0F;
+}
+
+/**
+ * 3. Subheader
+ */
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-left: 1px solid #CCCCCC;
+  border-right: 1px solid #CCCCCC;
+}
+
+/**
+ * 4. Content
+ */
+
+.comment {
+  border-right: 1px dotted #CCCCCC;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+/**
+ * 6. Footer
+ */
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu ul {
+  border-left: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul {
+  border-left: 1px solid #2F1C0F;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/majan-blue.css'
--- styles/majan-blue.css	1970-01-01 00:00:00 +0000
+++ styles/majan-blue.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,245 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+* {
+  color: #000000;
+}
+
+body {
+  color: #333333;
+  background: #FFFFFF;
+}
+
+.container {
+  background: #FFFFFF;
+}
+
+/**
+ * 2. Header
+ */
+
+#header {
+  background: url("../images/header.png") repeat-x scroll 0 0 #796646;
+}
+
+#header li {
+  border-left: 1px solid #2F1C0F;
+}
+
+#header li.last {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header li a {
+  color: #FFFFFF;
+  text-shadow: 1px 1px 1px #333333;
+}
+
+#header li a.active, #header li a:hover {
+  background: url("../images/mainnav.png") repeat scroll 0 0 transparent;
+}
+
+#header #search {
+  border: 2px solid #4F3B14;
+  background: #FFFFFF;
+  box-shadow: inset #DFDFDF 2px 2px 2px;
+  -moz-box-shadow: inset #DFDFDF 2px 2px 2px;
+  -webkit-box-shadow: inset #DFDFDF 2px 2px 2px;
+}
+
+#header #search * {
+  color: #925B39;
+  background: transparent;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader {
+  background: url("../images/dotted.png") repeat scroll 0 0 #B1A585;
+}
+
+#subheader .container {
+}
+
+#subheader .container-inside {
+  background-color: #EEEEEE;
+  box-shadow: #DFDFDF 0 1px 1px;
+  -moz-box-shadow: #DFDFDF 0 1px 1px;
+  -webkit-box-shadow: #DFDFDF 0 1px 1px;
+}
+
+#subheader .links a:focus, #subheader .links a:hover,
+#subheader .links a:active, #subheader .links li.active a {
+  background-color: #EFEFEF;
+  color: #4F3B14;
+}
+
+#subheader .form-submit {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-submit:hover {
+  background-color:#f7f7f7;
+  border: 1px solid #4F3B14;
+}
+
+#subheader .form-text {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-text:focus {
+  background-color: #EEEEEE;
+  border: 1px solid #4F3B14;
+}
+
+#subheader .block-search {
+  float: right;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-right: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  background: url(../images/launchpad-logo.png) 4px 2px no-repeat;
+}
+
+/**
+ * 4. Content
+ */
+
+#content {
+  background: url("../images/dotted.png") repeat scroll 0 0 #B1A585;
+}
+
+#content .block h2 {
+  color: #3D273A;
+  border-bottom: dotted 1px #999999;
+}
+
+#content .block a {
+  color: #4F3B14;
+}
+
+h1 {
+  color: #2F1C0F;
+}
+
+#center h2 a {
+  color: #2F1C0F;
+}
+
+.submitted {
+  color: #777777;
+}
+
+.comment h3 a {
+  color: #3D273A;
+}
+
+.comment {
+  border-left: 1px dotted #CCCCCC;
+  border-bottom: 1px dotted #CCCCCC;
+}
+
+.new {
+  color: #555555;
+}
+
+.node .links a, .comment .links a {
+  color: #555555;
+}
+
+.messages, .status {
+  background: #EEEEEE;
+  color: #444444;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .block {
+  background:  #EEEEEE;
+  box-shadow: #DFDFDF 0 2px 2px;
+  -moz-box-shadow: #DFDFDF 0 2px 2px;
+  -webkit-box-shadow: #DFDFDF 0 2px 2px;
+}
+
+/**
+ * 6. Footer
+ */
+
+#footer {
+  background: url("../images/footer.png") repeat-x scroll 0 0 #D3CAAA;
+}
+
+#footer .block h2 {
+  color: #C31B1B;
+  font-size: 11px;
+  font-weight: normal;
+  margin: 0 0 9px;
+}
+
+#footer .block a {
+  border-bottom: dotted 1px #999999;
+}
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu a, ul.nice-menu ul, ul.nice-menu li, ul.nice-menu-down,
+ul.nice-menu-down ul, ul.nice-menu-down li, ul.nice-menu li.menuparent,
+ul.nice-menu li.menuparent a, ul.nice-menu li.menuparent a:hover,
+ul.nice-menu li.menuparent:hover, ul.nice-menu li.menuparent:hover a {
+  background-color: transparent;
+  background-image: none;
+}
+
+ul.nice-menu, ul.nice-menu ul {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul {
+  border-right: 1px solid #2F1C0F;
+}
+
+#header ul.nice-menu li ul li {
+  background-color: #2F1C0F;
+}
+
+#header ul.nice-menu li ul li a {
+  background: none;
+  background-color: #796646;
+}
+
+#header ul.nice-menu li ul li a:hover {
+  background-image: url("../images/mainnav.png");
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/ubuntu-2010-rtl.css'
--- styles/ubuntu-2010-rtl.css	1970-01-01 00:00:00 +0000
+++ styles/ubuntu-2010-rtl.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,77 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+
+/**
+ * 2. Header
+ */
+
+
+#header li {
+  border-right: 1px solid #F07B55;
+}
+
+#header li.last {
+  border-left: 1px solid #F07B55;
+}
+
+/**
+ * 3. Subheader
+ */
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-left: 1px solid #CCCCCC;
+  border-right: 1px solid #CCCCCC;
+}
+
+/**
+ * 4. Content
+ */
+
+.comment {
+  border-right: 1px dotted #CCCCCC;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+/**
+ * 6. Footer
+ */
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu ul {
+  border-left: 1px solid #F07B55;
+}
+
+#header ul.nice-menu li ul {
+  border-left: 1px solid #F07B55;
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'styles/ubuntu-2010.css'
--- styles/ubuntu-2010.css	1970-01-01 00:00:00 +0000
+++ styles/ubuntu-2010.css	2010-11-30 21:26:38 +0000
@@ -0,0 +1,242 @@
+/* $Id$ */
+
+/**
+ * Index:
+ * 1. Body
+ * 2. Header
+ * 3. Subheader
+ * 4. Content
+ * 5. Sidebar
+ * 6. Footer
+ * 7. Nice Menus
+ * 8. Advanced Forum
+ */
+
+
+/**
+ * 1. Body
+ */
+
+* {
+  color: #000000;
+}
+
+body {
+  color: #333333;
+  background: #FFFFFF;
+}
+
+.container {
+  background: #FFFFFF;
+}
+
+/**
+ * 2. Header
+ */
+
+#header {
+  background: url("../images/header.png") repeat-x scroll 0 0 #EF5A29;
+}
+
+#header li {
+  border-left: 1px solid #F07B55;
+}
+
+#header li.last {
+  border-right: 1px solid #F07B55;
+}
+
+#header li a {
+  color: #FFFFFF;
+  text-shadow: 1px 1px 1px #333333;
+}
+
+#header li a.active, #header li a:hover {
+  background: url("../images/mainnav.png") repeat scroll 0 0 transparent;
+}
+
+#header #search {
+  border: 2px solid #B73F00;
+  background: #FFFFFF;
+  box-shadow: inset #DFDFDF 2px 2px 2px;
+  -moz-box-shadow: inset #DFDFDF 2px 2px 2px;
+  -webkit-box-shadow: inset #DFDFDF 2px 2px 2px;
+}
+
+#header #search * {
+  color: #E24E00;
+  background: transparent;
+}
+
+/**
+ * 3. Subheader
+ */
+
+#subheader {
+  background: url("../images/dotted.png") repeat scroll 0 0 #FFFFFF;
+}
+
+#subheader .container {
+}
+
+#subheader .container-inside {
+  background-color: #F7F7F7;
+  box-shadow: #DFDFDF 0 1px 1px;
+  -moz-box-shadow: #DFDFDF 0 1px 1px;
+  -webkit-box-shadow: #DFDFDF 0 1px 1px;
+}
+
+#subheader .links a:focus, #subheader .links a:hover,
+#subheader .links a:active, #subheader .links li.active a {
+  background-color: #EFEFEF;
+  color: #DD4814;
+}
+
+#subheader .form-submit {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-submit:hover {
+  background-color:#f7f7f7;
+  border: 1px solid #DD4814;
+}
+
+#subheader .form-text {
+  background-color: #F0F0F0;
+  border: 1px solid #CCCCCC;
+}
+
+#subheader .form-text:focus {
+  background-color: #F7F7F7;
+  border: 1px solid #DD4814;
+}
+
+#subheader .block-search {
+  float: right;
+}
+
+/* launchpad login */
+#subheader #openid-launchpad-login-form input {
+  border-right: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  background: url(../images/launchpad-logo.png) 4px 2px no-repeat;
+}
+
+/**
+ * 4. Content
+ */
+
+#content {
+  background: url("../images/dotted.png") repeat scroll 0 0 #FFFFFF;
+}
+
+#content .block h2 {
+  color: #3D273A;
+  border-bottom: dotted 1px #999999;
+}
+
+#content .block a {
+  color: #111111;
+}
+
+h1 {
+  color: #E24D00;
+}
+
+#center h2 a {
+  color: #E24D00;
+}
+
+.submitted {
+  color: #777777;
+}
+
+.comment h3 a {
+  color: #3D273A;
+}
+
+.comment {
+  border-left: 1px dotted #CCCCCC;
+  border-bottom: 1px dotted #CCCCCC;
+}
+
+.new {
+  color: #555555;
+}
+
+.node .links a, .comment .links a {
+  color: #555555;
+}
+
+.messages, .status {
+  background: #F8F8F8;
+  color: #444444;
+}
+
+/**
+ * 5. Sidebar
+ */
+
+.sidebar .block {
+  background:  #F8F8F8;
+  box-shadow: #DFDFDF 0 2px 2px;
+  -moz-box-shadow: #DFDFDF 0 2px 2px;
+  -webkit-box-shadow: #DFDFDF 0 2px 2px;
+}
+
+/**
+ * 6. Footer
+ */
+
+#footer {
+  background: url("../images/footer.png") repeat-x scroll 0 0 #EEECEA;
+}
+
+#footer .block h2 {
+  color: #8C3158;
+}
+
+#footer .block a {
+  border-bottom: dotted 1px #999999;
+}
+
+/**
+ * 7. Nice Menus
+ */
+
+/* Reset Nice Menu CSS */
+
+ul.nice-menu, ul.nice-menu a, ul.nice-menu ul, ul.nice-menu li, ul.nice-menu-down,
+ul.nice-menu-down ul, ul.nice-menu-down li, ul.nice-menu li.menuparent,
+ul.nice-menu li.menuparent a, ul.nice-menu li.menuparent a:hover,
+ul.nice-menu li.menuparent:hover, ul.nice-menu li.menuparent:hover a {
+  background-color: transparent;
+  background-image: none;
+}
+
+ul.nice-menu, ul.nice-menu ul {
+  border-right: 1px solid #F07B55
+}
+
+#header ul.nice-menu li ul {
+  border-right: 1px solid #F07B55
+}
+
+#header ul.nice-menu li ul li {
+  background-color: #E45813;
+}
+
+#header ul.nice-menu li ul li a {
+  background: none;
+  background-color: #EF5A29;
+}
+
+#header ul.nice-menu li ul li a:hover {
+  background-image: url("../images/mainnav.png");
+}
+
+/**
+ * 8. Advanced Forums
+ */
+

=== added file 'template.php'
--- template.php	1970-01-01 00:00:00 +0000
+++ template.php	2010-11-30 21:26:38 +0000
@@ -0,0 +1,204 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Core functions for the operations of the theme
+ */
+
+/**
+ * hook_preprocess_search_theme_form()
+ * Override display of search form.
+ */
+function udtheme_preprocess_search_theme_form(&$vars, $hook) {
+  $vars['form']['search_theme_form']['#title'] = '';
+  $vars['form']['search_theme_form']['#value'] = t('Search...');
+  $vars['form']['submit']['#value'] = t('Go');
+  unset($vars['form']['search_theme_form']['#printed']);
+  $vars['search']['search_theme_form'] = drupal_render($vars['form']['search_theme_form']);
+  unset($vars['form']['submit']['#printed']);
+  $vars['search']['submit'] = drupal_render($vars['form']['submit']);
+  $vars['search_form'] = implode($vars['search']);
+}
+
+/**
+ * hook_preprocess_search_block_form()
+ * Override display of search block.
+ */
+function udtheme_preprocess_search_block_form(&$vars, $hook) {
+  $vars['form']['search_block_form']['#title'] = '';
+  $vars['form']['search_block_form']['#value'] = t('Search...');
+  $vars['form']['submit']['#value'] = t('Go');
+  unset($vars['form']['search_block_form']['#printed']);
+  $vars['search']['search_block_form'] = drupal_render($vars['form']['search_block_form']);
+  unset($vars['form']['submit']['#printed']);
+  $vars['search']['submit'] = drupal_render($vars['form']['submit']);
+  $vars['search_form'] = implode($vars['search']);
+}
+
+/**
+ * hook_preprocess_page
+ * Generate / override exsisting variables
+ */
+function udtheme_preprocess_page(&$vars) {
+  $vars['menu']         = udtheme_whichmenu($vars['main_menu']);
+  $vars['submenu']      = udtheme_secondary_menu($vars['secondary_menu']);
+  $vars['logo']         = udtheme_buildlogo($vars);
+  $vars['min_width']    = theme_get_setting('page_minwidth');
+  $vars['pg_width']     = pagewidth();
+}
+
+/**
+ * Override or insert variables into the html template.
+ */
+function udtheme_preprocess_html(&$vars) {
+  $trademark_css = 'http://edge.launchpad.net/ubuntu-drupal-theme/trademark/6.7.0/+download/trademark-rtl.css';
+
+  if (!theme_get_setting('udtheme_trademark')) {
+    drupal_add_css(
+      path_to_theme() . '/styles/' . theme_get_setting('udtheme_style') . '.css',
+      array(
+        'group' => CSS_THEME,
+        'preprocess' => FALSE,
+      )
+    );
+  }
+  else {
+    drupal_add_css(
+      NULL,
+      array(
+        'group' => CSS_THEME,
+        'preprocess' => FALSE,
+        'external' => $trademark_css,
+      )
+    );
+  }
+}
+
+/**
+ * Automatically use the nice_menu module if available
+ * If not available, no drop downs will be displayed
+ */
+function udtheme_whichmenu($main_menu) {
+  if (module_exists('nice_menus')) {
+    // Nice Menu
+    $menu = theme('nice_menus_main_menu', $main_menu);
+    if (!isset($menu)) {
+      // This is deprecated in the latest nice_menus module.
+      $menu = theme('nice_menu_main_menu', $main_menu);
+    }
+  }
+  else {
+    // Standard Menu
+    $menu = theme('links', array('links' => $main_menu));
+  }
+
+  if (isset($menu)) {
+    return $menu;
+  }
+}
+
+/**
+ * Generate a logo if the variable exists
+ */
+function udtheme_buildlogo($vars) {
+  if ($vars['logo']) {
+    $logo = '<div id="logo">' .
+            '  <a href="' . check_url($vars['front_page']) . '" title="' . $vars['site_name'] . '">' .
+            '    <img src="' . check_url($vars['logo']) . '" alt="' . $vars['site_name'] . '" />' .
+            '  </a>' .
+            '</div>';
+  }
+  if (isset($logo)) {
+    return $logo;
+  }
+}
+
+/**
+ * Theme setting to either show or hide extra help
+ */
+function udtheme_help($help = NULL) {
+  return theme_get_setting('display_help') ? $help : NULL;
+}
+
+/**
+ * Code to handle things needing a static width
+ */
+function pagewidth() {
+  $type = theme_get_setting('width_type') == 1 ? '%' : 'px';
+  return theme_get_setting('wrapper_width') . $type;
+}
+
+/**
+ * Generate the default footer text.
+ * This big ugly thing keeps us from needing to set the default in udtheme.info.
+ */
+function udtheme_footer_text() {
+  // The default in udtheme.info is 'unset'
+  if (theme_get_setting('ubuntu_footer_text') == 'unset') {
+    return t('<div class="block"><h2>@legal</h2> !copy </div>'
+      . '<div class="block"><h2>@more</h2>!getubuntu !brainstorm !forums !spread </div>',
+      array(
+        '@legal' => t('Legal Disclaimer'),
+        '!copy' => t('&copy; 2010 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.'),
+        '@more' => t('More Ubuntu'),
+        '!getubuntu' => l(t('Get Ubuntu'), 'http://ubuntu.com/getubuntu/download/'),
+        '!brainstorm' => l(t('Ubuntu Brainstorm'), 'http://brainstorm.ubuntu.com/'),
+        '!forums' => l(t('Ubuntu Forums'), 'http://ubuntuforums.org/'),
+        '!spread' => l(t('Spread Ubuntu'), 'http://spreadubuntu.neomenlo.org/'),
+      )
+    );
+  }
+  else {
+    return theme_get_setting('ubuntu_footer_text');
+  }
+}
+
+/**
+ * Renders the secondary links in a nice pretty way.
+ */
+function udtheme_secondary_menu($secondary_menu) {
+  if (isset($secondary_menu)) {
+    return theme(
+      'links__system_secondary_menu',
+      array(
+        'links' => $secondary_menu,
+        'attributes' => array(
+          'id' => 'secondary-menu',
+          'class' => array(
+            'links',
+            'inline',
+            'clearfix',
+          )
+        ),
+        'heading' => NULL
+      )
+    );
+  }
+  else {
+    return NULL;
+  }
+}
+
+/**
+ * Sets the body-tag class attribute.
+ * Adds 'sidebar-left', 'sidebar-right' or 'sidebars' classes as needed.
+ */
+function udtheme_body_class($left = '', $right = '') {
+  if ($left && $right) {
+    $class = 'sidebars';
+  }
+  elseif ($left && !$right) {
+    $class = 'sidebar-left';
+  }
+  elseif (!$left && $right) {
+    $class = 'sidebar-right';
+  }
+  else {
+    $class = 'sidebar-none';
+  }
+
+  if (isset($class)) {
+    return ' class="' . $class . '"';
+  }
+}

=== renamed file 'template.php' => 'template.php.moved'
=== added file 'theme-settings.php'
--- theme-settings.php	1970-01-01 00:00:00 +0000
+++ theme-settings.php	2010-11-30 21:26:38 +0000
@@ -0,0 +1,105 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Theme setting callbacks for the garland theme.
+ */
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * @param $form
+ *   The form.
+ * @param $form_state
+ *   The form state.
+ */
+function udtheme_form_system_theme_settings_alter(&$form, &$form_state) {
+  require_once 'template.php';
+  $ubuntu_footer_text = udtheme_footer_text();
+
+  $form['page'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Page Options'),
+    '#collapsible' => FALSE,
+    '#tree' => FALSE,
+    '#weight' => -2
+  );
+  $form['page']['wrapper_width'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Page Width (default=980px)'),
+    '#default_value' => theme_get_setting('wrapper_width'),
+  );
+  $form['page']['width_type'] = array(
+    '#type' => 'radios',
+    '#title' => t('Width Type'),
+    '#options' => array(
+      '0' => t('px'),
+      '1' => t('%'),
+    ),
+    '#description' => t('Type of width to be used.'),
+    '#default_value' => theme_get_setting('width_type'),
+  );
+  $form['page']['page_minwidth'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Page Minimum Width'),
+    '#description' => t('Minimum width of the page. This should be 20px larger than the page width.'),
+    '#default_value' => theme_get_setting('page_minwidth'),
+  );
+  $form['page']['display_help'] = array(
+    '#type' => 'radios',
+    '#title' => t('Display Help'),
+    '#options' => array(
+      '1' => t('Yes'),
+      '0' => t('No'),
+    ),
+    '#description' => t('Display help above the content or not.'),
+    '#default_value' => theme_get_setting('display_help'),
+  );
+  $form['page']['ubuntu_footer'] = array(
+    '#type' => 'radios',
+    '#title' => t('Ubuntu Community Footer'),
+    '#options' => array(
+      '1' => t('Display'),
+      '0' => t('Hide'),
+    ),
+    '#description' => t('Display the Ubuntu Community Footer, which includes blocks for the legal disclaimer and other Ubuntu community websites.'),
+    '#default_value' => theme_get_setting('ubuntu_footer'),
+  );
+  $form['page']['ubuntu_footer_text'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Ubuntu Community Footer (Text)'),
+    '#description' => t('If the footer is enabled, this text will appear in it. The default is displayed here.'),
+    '#default_value' => $ubuntu_footer_text,
+  );
+
+  $form['style'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Style Options'),
+    '#collapsible' => FALSE,
+    '#tree' => FALSE,
+    '#weight' => 2,
+  );
+  $form['style']['udtheme_style'] = array(
+    '#type' => 'radios',
+    '#title' => t('Ubuntu Drupal Style'),
+    '#options' => array(
+      'classic-brown' => t('Classic Brown'),
+      'ubuntu-2010' => t('Official Ubuntu'),
+      'kimis-pink' => t('Kimi\'s Pink'),
+      'majan-blue' => t('Majan\'s Blue'),
+    ),
+    '#description' => t('Select which color pallet to apply to the theme. Under the trademark policy (http://bit.ly/Hk4DA) only Ubuntu related projects may use the "Official Ubuntu" style. The rest is open to anyone.'),
+    '#default_value' => theme_get_setting('udtheme_style'),
+  );
+  $form['style']['udtheme_trademark'] = array(
+    '#type' => 'radios',
+    '#title' => t('Ubuntu Community Styles'),
+    '#options' => array(
+      '0' => t('Disabled'),
+      '1' => t('Enabled'),
+    ),
+    '#description' => t('This will override the above style sheet. It is for use by Ubuntu related projects only. It uses external images which are trademarked and requires CSS aggregation. (http://bit.ly/Hk4DA)'),
+    '#default_value' => theme_get_setting('udtheme_trademark'),
+  );
+}

=== renamed file 'theme-settings.php' => 'theme-settings.php.moved'
=== added file 'udtheme.info'
--- udtheme.info	1970-01-01 00:00:00 +0000
+++ udtheme.info	2010-11-30 21:26:38 +0000
@@ -0,0 +1,30 @@
+; $Id$
+name = Ubuntu Drupal Theme
+description = Ubuntu-Drupal is a theme for Ubuntu LoCo web sites. Based on the new branding introduced for Ubuntu in 2010.
+core = 7.x
+version = 7.7.0
+engine = phptemplate
+
+settings[wrapper_width] = 980
+settings[width_type] = 0
+settings[page_minwidth] = 1000px
+settings[display_help] = 0
+settings[ubuntu_footer] = 1
+settings[ubuntu_footer_text] = unset
+settings[udtheme_style] = classic-brown
+settings[udtheme_trademark] = 0
+
+stylesheets[all][] = styles/base.css
+
+regions[top_header] = Top Header
+regions[search] = Search Box
+regions[subheader] = Second Header
+regions[above_content] = Above Content and Sidebars
+regions[top_content] = Above Content and Between Sidebars
+regions[left] = Left Sidebar
+regions[right] = Right Sidebar
+regions[content] = Below Content
+regions[footer] = Footer
+
+features[] = main_menu
+features[] = secondary_menu

=== renamed file 'udtheme.info' => 'udtheme.info.moved'