? sites/default/files
? sites/default/private
? sites/default/settings.php
? themes/bartik/images
? themes/bartik/logo.png
? themes/bartik/screenshot.png
? themes/bartik/color/base.png
? themes/bartik/color/preview.png
Index: themes/bartik/bartik.info
===================================================================
RCS file: themes/bartik/bartik.info
diff -N themes/bartik/bartik.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/bartik.info	31 Jan 2010 23:30:23 -0000
@@ -0,0 +1,31 @@
+;$Id$
+name = Bartik
+description = A flexible theme with many regions. Suitable for hacking to make your own theme.
+version = VERSION
+core = 7.x
+engine = phptemplate
+
+stylesheets[all][] = css/reset.css
+stylesheets[all][] = css/layout.css
+stylesheets[all][] = css/style.css
+stylesheets[all][] = css/color.css
+
+regions[header] = Header
+regions[help] = Help
+regions[page_top] = Page top
+regions[page_bottom] = Page bottom
+regions[highlight] = Highlighted
+
+regions[featured] = Featured
+regions[content] = Content
+regions[sidebar_first] = Sidebar
+
+regions[triptych_first] = Triptych first
+regions[triptych_middle] = Triptych middle
+regions[triptych_last] = Triptych last
+
+regions[footer_firstcolumn] = Footer first column
+regions[footer_secondcolumn] = Footer second column
+regions[footer_thirdcolumn] = Footer third column
+regions[footer_fourthcolumn] = Footer fourth column
+regions[footer] = Footer
Index: themes/bartik/comment-wrapper.tpl.php
===================================================================
RCS file: themes/bartik/comment-wrapper.tpl.php
diff -N themes/bartik/comment-wrapper.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/comment-wrapper.tpl.php	31 Jan 2010 23:30:23 -0000
@@ -0,0 +1,48 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Default theme implementation to wrap comments.
+ *
+ * Available variables:
+ * - $content: The array of content-related elements for the node. Use
+ *   render($content) to print them all, or
+ *   print a subset such as render($content['comment_form']).
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default value has the following:
+ *   - comment-wrapper: The current template type, i.e., "theming hook".
+ *
+ * The following variables are provided for contextual information.
+ * - $node: Node object the comments are attached to.
+ * The constants below the variables show the possible values and should be
+ * used for comparison.
+ * - $display_mode
+ *   - COMMENT_MODE_FLAT
+ *   - COMMENT_MODE_THREADED
+ *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess_comment_wrapper()
+ * @see theme_comment_wrapper()
+ */
+?>
+<div id="comments-wrapper">
+  <div id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
+    <?php if ($node->type != 'forum'): ?>
+      <h2 class="comments"><?php print t('Comments'); ?></h2>
+    <?php endif; ?>
+
+    <?php print render($content['comments']); ?>
+
+    <?php if ($content['comment_form']): ?>
+      <h2 class="title"><?php print t('Post new comment'); ?></h2>
+      <div>
+        <?php print render($content['comment_form']); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+</div>
Index: themes/bartik/comment.tpl.php
===================================================================
RCS file: themes/bartik/comment.tpl.php
diff -N themes/bartik/comment.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/comment.tpl.php	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,103 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Default theme implementation for comments.
+ *
+ * Available variables:
+ * - $author: Comment author. Can be link or plain text.
+ * - $content: An array of comment items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $created: Formatted date and time for when the comment was created.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->created variable.
+ * - $changed: Formatted date and time for when the comment was last changed.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->changed variable.
+ * - $new: New comment marker.
+ * - $permalink: Comment permalink.
+ * - $picture: Authors picture.
+ * - $signature: Authors signature.
+ * - $status: Comment status. Possible values are:
+ *   comment-unpublished, comment-published or comment-preview.
+ * - $title: Linked title.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - comment: The current template type, i.e., "theming hook".
+ *   - comment-by-anonymous: Comment by an unregistered user.
+ *   - comment-by-node-author: Comment by the author of the parent node.
+ *   - comment-preview: When previewing a new or edited comment.
+ *   The following applies only to viewers who are registered users:
+ *   - comment-unpublished: An unpublished comment visible only to administrators.
+ *   - comment-by-viewer: Comment by the user currently viewing the page.
+ *   - comment-new: New comment since last the visit.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * These two variables are provided for context:
+ * - $comment: Full comment object.
+ * - $node: Node object the comments are attached to.
+ *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_comment()
+ * @see template_process()
+ * @see theme_comment()
+ */
+?>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+
+  <div class="attribution">
+
+    <?php print $picture; ?>
+
+    <div class="submitted">
+      <?php print $permalink; ?>
+      <p class="commenter-name">
+        <?php print t('!username ', array('!username' => $author)); ?>
+      </p>
+      <p class="comment-time">
+        <?php print t('!datetime.', array('!datetime' => $created)); ?>
+      </p>
+    </div>
+
+  </div> <!-- /.attribution -->
+
+  <div class="comment-text">
+    <div class="comment-arrow"></div>
+
+    <?php if ($new): ?>
+      <span class="new"><?php print $new ?></span>
+    <?php endif; ?>
+
+    <?php print render($title_prefix); ?>
+    <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
+    <?php print render($title_suffix); ?>
+
+    <div class="content"<?php print $content_attributes; ?>>
+      <?php
+        // We hide the comments and links now so that we can render them later.
+        hide($content['links']);
+        print render($content);
+      ?>
+      <?php if ($signature): ?>
+      <div class="user-signature clearfix">
+        <?php print $signature ?>
+      </div>
+      <?php endif; ?>
+    </div> <!-- /.content -->
+
+    <?php print render($content['links']) ?>
+  </div> <!-- /.comment-text -->
+</div>
Index: themes/bartik/node.tpl.php
===================================================================
RCS file: themes/bartik/node.tpl.php
diff -N themes/bartik/node.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/node.tpl.php	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,131 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Default theme implementation to display a node.
+ *
+ * Available variables:
+ * - $title: the (sanitized) title of the node.
+ * - $content: An array of node items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $user_picture: The node author's picture from user-picture.tpl.php.
+ * - $date: Formatted creation date. Preprocess functions can reformat it by
+ *   calling format_date() with the desired parameters on the $created variable.
+ * - $name: Themed username of node author output from theme_username().
+ * - $node_url: Direct url of the current node.
+ * - $terms: the themed list of taxonomy term links output from theme_links().
+ * - $display_submitted: whether submission information should be displayed.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - node: The current template type, i.e., "theming hook".
+ *   - node-[type]: The current node type. For example, if the node is a
+ *     "Blog entry" it would result in "node-blog". Note that the machine
+ *     name will often be in a short form of the human readable label.
+ *   - node-teaser: Nodes in teaser form.
+ *   - node-preview: Nodes in preview mode.
+ *   The following are controlled through the node publishing options.
+ *   - node-promoted: Nodes promoted to the front page.
+ *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings.
+ *   - node-unpublished: Unpublished nodes visible only to administrators.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Other variables:
+ * - $node: Full node object. Contains data that may not be safe.
+ * - $type: Node type, i.e. story, page, blog, etc.
+ * - $comment_count: Number of comments attached to the node.
+ * - $uid: User ID of the node author.
+ * - $created: Time the node was published formatted in Unix timestamp.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
+ *   teaser listings.
+ * - $id: Position of the node. Increments each time it's output.
+ *
+ * Node status variables:
+ * - $view_mode: View mode, e.g. 'full', 'teaser'...
+ * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser').
+ * - $page: Flag for the full page state.
+ * - $promote: Flag for front page promotion state.
+ * - $sticky: Flags for sticky post setting.
+ * - $status: Flag for published status.
+ * - $comment: State of comment settings for the node.
+ * - $readmore: Flags true if the teaser content of the node cannot hold the
+ *   main body content.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ *
+ * Field variables: for each field instance attached to the node a corresponding
+ * variable is defined, e.g. $node->body becomes $body. When needing to access
+ * a field's raw values, developers/themers are strongly encouraged to use these
+ * variables. Otherwise they will have to explicitly specify the desired field
+ * language, e.g. $node->body['en'], thus overriding any language negotiation
+ * rule that was previously applied.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_node()
+ * @see template_process()
+ */
+?>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+
+  <?php print render($title_prefix); ?>
+  <?php if (!$page): ?>
+    <h2<?php print $title_attributes; ?>>
+      <a href="<?php print $node_url; ?>"><?php print $node_title; ?></a>
+    </h2>
+  <?php endif; ?>
+  <?php print render($title_suffix); ?>
+
+  <?php if ($display_submitted || !empty($content['links']['terms'])): ?>
+    <div class="meta">
+
+      <?php if ($display_submitted): ?>
+        <span class="submitted">
+          <?php print $user_picture; ?>
+          <?php print $published; ?>
+        </span>
+      <?php endif; ?>
+
+      <?php if (!empty($content['links']['terms'])): ?>
+        <div class="terms terms-inline">
+          <?php print render($content['links']['terms']); ?>
+        </div>
+      <?php endif; ?>
+
+    </div> <!-- /.meta -->
+  <?php endif; ?>
+
+  <div class="content clearfix"<?php print $content_attributes; ?>>
+    <?php
+      // We hide the comments and links now so that we can render them later.
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?>
+  </div>
+
+  <?php
+    // Remove the "Add new comment" link.
+    unset($content['links']['comment']['#links']['comment_add']);
+    $links = render($content['links']);
+    // Only display the wrapper div if there are links.
+    if ($links):
+  ?>
+    <div class="link-wrapper">
+      <?php print $links; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php print render($content['comments']); ?>
+
+</div>
Index: themes/bartik/page.tpl.php
===================================================================
RCS file: themes/bartik/page.tpl.php
diff -N themes/bartik/page.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/page.tpl.php	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,230 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Default theme implementation to display a single Drupal page.
+ *
+ * Available variables:
+ *
+ * General utility variables:
+ * - $base_path: The base URL path of the Drupal installation. At the very
+ *   least, this will always default to /.
+ * - $directory: The directory the template is located in, e.g. modules/system
+ *   or themes/garland.
+ * - $is_front: TRUE if the current page is the front page.
+ * - $logged_in: TRUE if the user is registered and signed in.
+ * - $is_admin: TRUE if the user has permission to access administration pages.
+ *
+ * Site identity:
+ * - $front_page: The URL of the front page. Use this instead of $base_path,
+ *   when linking to the front page. This includes the language domain or
+ *   prefix.
+ * - $logo: The path to the logo image, as defined in theme configuration.
+ * - $site_name: The name of the site, empty when display has been disabled
+ *   in theme settings.
+ * - $site_slogan: The slogan of the site, empty when display has been disabled
+ *   in theme settings.
+ *
+ * Navigation:
+ * - $main_menu (array): An array containing the Main menu links for the
+ *   site, if they have been configured.
+ * - $secondary_menu (array): An array containing the Secondary menu links for
+ *   the site, if they have been configured.
+ * - $breadcrumb: The breadcrumb trail for the current page.
+ *
+ * Page content (in order of occurrence in the default page.tpl.php):
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title: The page title, for use in the actual HTML content.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ * - $messages: HTML for status and error messages. Should be displayed
+ *   prominently.
+ * - $tabs (array): Tabs linking to any sub-pages beneath the current page
+ *   (e.g., the view and edit tabs when displaying a node).
+ * - $action_links (array): Actions local to the page, such as 'Add menu' on the
+ *   menu administration interface.
+ * - $feed_icons: A string of all feed icons for the current page.
+ * - $node: The node object, if there is an automatically-loaded node
+ *   associated with the page, and the node ID is the second argument
+ *   in the page's path (e.g. node/12345 and node/12345/revisions, but not
+ *   comment/reply/12345).
+ *
+ * Regions:
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['highlight']: Items for the highlighted content region.
+ * - $page['content']: The main content of the current page.
+ * - $page['sidebar_first']: Items for the first sidebar.
+ * - $page['header']: Items for the header region.
+ * - $page['footer']: Items for the footer region.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_page()
+ * @see template_process()
+ */
+?>
+<div id="page-wrapper"><div id="page">
+
+  <div id="header"><div class="section clearfix">
+
+    <?php if ($logo): ?>
+      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+        <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+      </a>
+    <?php endif; ?>
+
+    <?php if ($site_name || $site_slogan): ?>
+      <div id="name-and-slogan">
+
+        <?php if ($site_name): ?>
+          <?php if ($title): ?>
+            <div id="site-name"<?php if (!$show_site_name) { print ' class="header-hidden"'; } ?>>
+              <strong>
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </strong>
+            </div>
+          <?php else: /* Use h1 when the content title is empty */ ?>
+            <h1 id="site-name"<?php if (!$show_site_name) { print ' class="header-hidden"'; } ?>>
+              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+            </h1>
+          <?php endif; ?>
+        <?php endif; ?>
+
+        <?php if ($site_slogan): ?>
+          <div id="site-slogan"<?php if (!$show_site_slogan) { print ' class="header-hidden"'; } ?>>
+            <?php print $site_slogan; ?>
+          </div>
+        <?php endif; ?>
+
+      </div> <!-- /#name-and-slogan -->
+    <?php endif; ?>
+
+    <?php print render($page['header']); ?>
+
+    <?php if ($main_menu): ?>
+      <div id="navigation"><div class="section clearfix">
+        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+      </div></div> <!-- /.section, /#navigation -->
+    <?php endif; ?>
+
+  </div></div> <!-- /.section, /#header -->
+
+  <?php if ($messages): ?>
+    <div id="messages"><div class="section clearfix">
+      <?php print $messages; ?>
+    </div></div> <!-- /.section, /#messages -->
+  <?php endif; ?>
+
+  <?php if ($page['featured']): ?>
+    <div id="featured" class="region"><div class="section clearfix">
+      <?php print render($page['featured']); ?>
+    </div></div> <!-- /.section, /#featured -->
+  <?php endif; ?>
+
+  <div id="main-wrapper"><div id="main" class="clearfix">
+
+    <?php if ($breadcrumb): ?>
+      <div id="breadcrumb"><?php print $breadcrumb; ?></div>
+    <?php endif; ?>
+
+    <div id="content" class="column"><div class="section">
+      <?php if ($page['highlight']): ?><div id="highlight"><?php print render($page['highlight']); ?></div><?php endif; ?>
+      <a id="main-content"></a>
+      <?php print render($title_prefix); ?>
+      <?php if ($title): ?>
+        <h1 class="title" id="page-title">
+          <?php print $title; ?>
+        </h1>
+      <?php endif; ?>
+      <?php print render($title_suffix); ?>
+      <?php if ($tabs): ?>
+        <div class="tabs">
+          <?php print render($tabs); ?>
+        </div>
+      <?php endif; ?>
+      <?php print render($page['help']); ?>
+      <?php if ($action_links): ?>
+        <ul class="action-links">
+          <?php print render($action_links); ?>
+        </ul>
+      <?php endif; ?>
+      <?php print render($page['content']); ?>
+      <?php print $feed_icons; ?>
+
+    </div></div> <!-- /.section, /#content -->
+
+    <?php if ($page['sidebar_first']): ?>
+      <div id="sidebar-first" class="column sidebar"><div class="section">
+        <?php print render($page['sidebar_first']); ?>
+      </div></div> <!-- /.section, /#sidebar-first -->
+    <?php endif; ?>
+
+  </div></div> <!-- /#main, /#main-wrapper -->
+
+  <?php if ($page['triptych_first']): ?>
+    <div id="triptych-wrapper"><div id="triptych" class="clearfix">
+
+      <?php if ($page['triptych_first']): ?>
+        <div id="triptych-first" class="region triptych"><div class="section">
+          <?php print render($page['triptych_first']); ?>
+        </div></div> <!-- /.section, /#triptych-first -->
+      <?php endif; ?>
+
+      <?php if ($page['triptych_middle']): ?>
+        <div id="triptych-middle" class="region triptych"><div class="section">
+          <?php print render($page['triptych_middle']); ?>
+        </div></div> <!-- /.section, /#triptych-middle -->
+      <?php endif; ?>
+
+      <?php if ($page['triptych_last']): ?>
+        <div id="triptych-last" class="region triptych"><div class="section">
+          <?php print render($page['triptych_last']); ?>
+        </div></div> <!-- /.section, /#triptych-last -->
+      <?php endif; ?>
+
+    </div></div> <!-- /#triptych, /#triptych-wrapper -->
+  <?php endif; ?>
+
+  <div id="footer-wrapper"><div class="section">
+
+    <?php if ($page['footer_firstcolumn']): ?>  <!-- This should be a 4-part statement w/ ORs -->
+      <div id="footer-columns" class="clearfix">
+
+        <?php if ($page['footer_firstcolumn']): ?>
+          <div id="footer-firstcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_firstcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-firstcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_secondcolumn']): ?>
+          <div id="footer-secondcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_secondcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-secondcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_thirdcolumn']): ?>
+          <div id="footer-thirdcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_thirdcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-thirdcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_fourthcolumn']): ?>
+          <div id="footer-fourthcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_fourthcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-fourthcolumn -->
+        <?php endif; ?>
+
+      </div><!-- /#footer-columns -->
+    <?php endif; ?>
+
+    <div id="footer" class="clearfix">
+      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+      <?php print render($page['footer']); ?>
+    </div><!-- /#footer -->
+
+  </div></div> <!-- /.section, /#footer-wrapper -->
+
+</div></div> <!-- /#page, /#page-wrapper -->
Index: themes/bartik/template.php
===================================================================
RCS file: themes/bartik/template.php
diff -N themes/bartik/template.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/template.php	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,62 @@
+<?php
+// $Id$
+
+/**
+* Add body classes if certain regions have content.
+*/
+function bartik_preprocess_html(&$variables) {
+  if (!empty($variables['page']['featured'])) {
+    $variables['classes_array'][] = 'featured';
+  }
+
+  if (!empty($variables['page']['triptych_first'])
+    || !empty($variables['page']['triptych_middle'])
+    || !empty($variables['page']['triptych_last'])) {
+    $variables['classes_array'][] = 'triptych';
+  }
+
+  if (!empty($variables['page']['footer_firstcolumn'])
+    || !empty($variables['page']['footer_secondcolumn'])
+    || !empty($variables['page']['footer_thirdcolumn'])
+    || !empty($variables['page']['footer_fourthcolumn'])) {
+    $variables['classes_array'][] = 'footer-columns';
+  }
+}
+
+/**
+ * Override or insert variables into the page template for HTML output.
+ */
+function bartik_process_html(&$variables) {
+  // Hook into color.module.
+  if (module_exists('color')) {
+    _color_html_alter($variables);
+  }
+}
+
+/**
+ * Override or insert variables into the page template.
+ */
+function bartik_process_page(&$variables) {
+  // Hook into color.module.
+  if (module_exists('color')) {
+    _color_page_alter($variables);
+  }
+  // Always print the site name, but don't always actually show it - the class
+  // "header-hidden" is added when it's supposed to be hidden.
+  $variables['site_name']   = filter_xss_admin(variable_get('site_name', 'Drupal'));
+  $variables['site_slogan'] = filter_xss_admin(variable_get('site_slogan', ''));
+
+  $variables['show_site_name']   = !is_null(theme_get_setting('toggle_name')) ? theme_get_setting('toggle_name') : TRUE;
+  $variables['show_site_slogan'] = !is_null(theme_get_setting('toggle_slogan')) ? theme_get_setting('toggle_slogan') : TRUE;
+}
+
+/**
+ * Override or insert variables into the node template.
+ */
+function bartik_process_node(&$variables) {
+  $published = theme_get_setting('authoring_' . $variables['node']->type)
+    ? theme_get_setting('authoring_' . $variables['node']->type)
+    : t('Published by [node:author] on [node:created]');
+
+  $variables['published'] = filter_xss_admin(token_replace($published, array('node' => $variables['node'])));
+}
Index: themes/bartik/theme-settings.php
===================================================================
RCS file: themes/bartik/theme-settings.php
diff -N themes/bartik/theme-settings.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/theme-settings.php	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,28 @@
+<?php
+// $Id$
+
+/**
+* Implementation of THEMEHOOK_settings() function.
+*
+* @param $saved_settings
+*   An array of saved settings for this theme.
+* @return
+*   A form array.
+*/
+function bartik_form_system_theme_settings_alter(&$form) {
+  // Get the node types.
+  $node_types = node_type_get_names();
+
+  $form['authoring_information'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Authoring information'),
+  );
+
+  foreach ($node_types as $type => $name) {
+    $form['authoring_information']['authoring_' . $type] = array(
+      '#type' => 'textfield',
+      '#title' => t('Authoring information for @type', array('@type' => $name)),
+      '#default_value' => theme_get_setting('authoring_' . $type) ? theme_get_setting('authoring_' . $type) : t('Published by [node:author] on [node:created]'),
+    );
+  }
+}
Index: themes/bartik/color/color.inc
===================================================================
RCS file: themes/bartik/color/color.inc
diff -N themes/bartik/color/color.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/color/color.inc	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,42 @@
+<?php
+// $Id$
+
+$info = array(
+  // Pre-defined color schemes.
+  'schemes' => array(
+    '#ffffff,#0073b6,#000000,#3d3d3d,#3b3b3b' => t('Bartik Default'),
+    '#ffffff,#0073b6,#2385c2,#5ab5ee,#3b3b3b' => t('Blue Lagoon'),    
+    '#f6eecc,#6B2454,#461453,#6B2454,#2c233f' => t('Plum'),
+    '#ffffff,#087095,#78B91A,#5b8b15,#585858' => t('Fresh'),
+  ),
+
+  // CSS files (excluding @import) to rewrite with new color scheme.
+  'css' => array(
+    'css/color.css',
+  ),
+
+  // Files to copy.
+  'copy' => array(
+    'logo.png',
+  ),
+
+  // Coordinates of gradient (x, y, width, height).
+  'gradient' => array(0, 0, 0, 0),
+
+  // Color areas to fill (x, y, width, height).
+  'fill' => array(),
+
+  // Coordinates of all the theme slices (x, y, width, height)
+  // with their filename as used in the stylesheet.
+  'slices' => array(),
+
+  // Reference color used for blending. Matches the base.png's colors.
+  'blend_target' => '#ffffff',
+
+  // Preview files.
+  'preview_image' => 'color/preview.png',
+  'preview_css' => 'color/preview.css',
+
+  // Base file for image generation.
+  'base_image' => 'color/base.png',
+);
Index: themes/bartik/color/preview.css
===================================================================
RCS file: themes/bartik/color/preview.css
diff -N themes/bartik/color/preview.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/color/preview.css	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1 @@
+/* $Id$ */
Index: themes/bartik/css/color.css
===================================================================
RCS file: themes/bartik/css/color.css
diff -N themes/bartik/css/color.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/css/color.css	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,22 @@
+/* $Id$ */
+
+/**
+ * Styles and colors that the color module will modify.
+ */
+body, #block-system-main {
+  color: #3b3b3b;
+}
+a {
+  color: #0073b6;
+}
+#header {
+  background-color: #000000;
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#000000), to(#3d3d3d));
+  background-image: -moz-linear-gradient(-90deg, #000000, #3d3d3d);
+}
+a:hover {
+  color: #018fe2;
+}
+a:active {
+  color: #23aeff; 
+}
Index: themes/bartik/css/layout.css
===================================================================
RCS file: themes/bartik/css/layout.css
diff -N themes/bartik/css/layout.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/css/layout.css	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,71 @@
+/* $Id$ */
+
+/**
+ * Basic layout styles
+ */
+#header div.section,
+#navigation div.section, 
+#featured div.section, 
+#messages div.section,
+#main,
+#triptych {
+  width: 960px;
+  margin-left: auto;
+  margin-right: auto;
+}
+#content {
+  display: inline;
+  float: left;
+  position: relative;
+  margin-left: 15px;
+  margin-right: 5px;
+  padding-right: 20px;
+  position: relative;
+  width: 640px;
+}
+#sidebar-first {
+  display: inline;
+  float: left;
+  margin-left: 25px;
+  margin-right: 15px;
+  position: relative;
+  width: 225px;
+}
+#breadcrumb {
+  margin-left: 15px;
+  margin-right: 15px;
+  width: 930px;
+}
+#triptych-first,
+#triptych-middle,
+#triptych-last {
+  display: inline;
+  float: left;
+  position: relative;
+  width: 290px;
+  margin: 20px 15px 30px;
+}
+#footer-wrapper {
+  padding: 35px 20px 30px;
+}
+#footer-columns {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
+#footer-firstcolumn,
+#footer-secondcolumn,
+#footer-thirdcolumn,
+#footer-fourthcolumn {
+  width: 210px;
+  display: inline;
+  float: left;
+  margin-left: 15px;
+  margin-right: 15px;
+  position: relative;
+}
+#footer {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
Index: themes/bartik/css/reset.css
===================================================================
RCS file: themes/bartik/css/reset.css
diff -N themes/bartik/css/reset.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/css/reset.css	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,34 @@
+/* $Id$ */
+
+/**
+ * Reset styles
+ */
+body {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+}
+img {
+  outline: 0;
+}
+/* Remember to define focus styles! */
+:focus {
+  outline: 0;
+}
+/* Tables still need 'cellspacing="0"' in the markup. */
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+}
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: "";
+}
+blockquote, q {
+  quotes: "" "";
+}
Index: themes/bartik/css/style.css
===================================================================
RCS file: themes/bartik/css/style.css
diff -N themes/bartik/css/style.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/css/style.css	31 Jan 2010 23:30:24 -0000
@@ -0,0 +1,677 @@
+/* $Id$ */
+
+/**
+ * Overall specifications
+ */
+body {
+  font-family: Georgia, "Times New Roman", Times, serif;
+  line-height: 1.4em;
+  font-size: 0.8em;
+  word-wrap: break-word;
+}
+a:link,
+a:visited {
+  text-decoration: none;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 1.0em 0 0.5em;
+  font-weight: inherit;
+}
+h1 {
+  font-size: 140%;
+  color: #000;
+}
+h2 {
+  font-size: 120%;
+}
+p {
+  margin: 1.2em 0 0.6em;
+}
+del {
+  text-decoration: line-through;
+}
+.block ul {
+  margin: 0;
+  padding: 0 0 0.25em;
+}
+ul.contextual-links {
+  font-size: 90%;
+  font-family: Arial, sans-serif;
+}
+
+/**
+ * Header
+ */
+#skip-link {
+  position: absolute;
+  text-indent: -9999px;
+}
+#header {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #fff;
+}
+#header a  {
+  color: #fff;
+}
+#header a:hover  {
+  color: #b5b7b9;
+}
+#header a:active  {
+  color: #adb0bf;
+}
+#header #logo {
+  float: left;
+  padding: 15px 30px 15px 0;
+}
+#header #name-and-slogan {
+  padding-top: 38px;
+  margin-bottom: 30px;
+}
+#header #site-name {
+  font-size: 200%;
+  color: #686868;
+}
+#header h1#site-name {
+  margin: 0;
+}
+#header #site-name a  {
+  font-weight: normal;
+}
+#header #site-slogan {
+  font-family: Georgia, "Times New Roman", Times, serif;
+  margin-top: 7px;
+  font-size: 100%;
+  word-spacing: 0.1em;
+  font-style: italic;
+}
+#header .header-hidden {
+  text-indent: -9999em;
+}
+/* Menus when in the header region. */
+#header div.block-menu, 
+#header div#block-system-main-menu,
+#header div#block-system-secondary-menu {
+  height: 1.1em;
+  margin: 10px 0;
+  font-size: 120%;
+  float: left;
+  width: 75%;
+}
+#header .block-menu h2,
+#header #block-system-main-menu h2,
+#header #block-system-secondary-menu h2 {
+  display: none;
+}
+#header .block-menu h2,
+#header #block-system-main-menu h2,
+#header #block-system-secondary-menu h2 {
+  display: none;
+}
+#header .block ul,
+#header .block li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+#header .block-menu li a,
+#header #block-system-main-menu li a,
+#header #block-system-secondary-menu li a {
+  float: left;
+  padding: 0 12px;
+  display: block;
+  border-right: 1px solid #555;
+}
+#header .block-menu li.first a,
+#header #block-system-main-menu li.first a,
+#header #block-system-secondary-menu li.first a {
+  padding-left: 0;
+}
+#header .block-menu li.last a,
+#header #block-system-main-menu li.last a,
+#header #block-system-secondary-menu li.last a {
+  padding-right: 0;
+  border-right: none;
+}
+/* Search block when in the header region. */
+#header #block-search-form {
+  float: right;
+  width: 24%;
+  margin: 8px 0;
+}
+/* Login block when in the header region. */
+#header #block-user-login {
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 2%;
+  background: #464748;
+  color: #fff;
+  float: right;
+  font-size: 13px;
+  padding: 4px 10px 5px;
+  font-family: Helvetica, Arial, sans-serif;
+  text-transform: uppercase;
+  font-size: 80%;
+}
+#header #block-user-login a {
+  color: #fff;
+  font-size: 90%;
+}
+#header #block-user-login h2 {
+  display: none;
+}
+#header #block-user-login .form-item label {
+  display: inline;
+  font-weight: normal;
+}
+#header #block-user-login .form-item {
+  display: inline;
+  font-weight: normal;
+}
+#header #block-user-login .form-text {
+  margin-right: 5px;
+}
+#header #block-user-login .form-item label .form-required {
+  display: none;
+}
+#header #block-user-login div.item-list,
+#header #block-user-login .item-list ul {
+  display: inline;
+}
+#header #block-user-login .item-list ul li {
+  display: inline;
+  margin: 0 5px 0 15px;
+}
+#header #block-user-login div.item-list {
+  margin-top: 5px;
+  font-style: italic;
+  font-family: Georgia, "Times New Roman", Times, serif;
+  font-size: 130%;
+  text-transform: none;
+}
+#header #block-user-login .userbox {
+  margin-left: 10px;
+}
+#header #block-user-login input.form-submit {
+  color: #fff;
+  background: #929599;
+  border: 1px solid #73767c;
+  padding: 1px;
+  text-transform: uppercase;
+  margin-top: 1px;
+  position: relative;
+  display: inline;
+}
+/* Hide create new account and email replacement password links. */
+#header #block-user-login #user-login-form div.item-list {
+  display: none;
+}
+
+/**
+ * Main navigation
+ */
+#navigation h2 {
+  margin-top: 0;  
+  display: none;
+}
+#navigation {
+  padding: 0 15px;
+}
+#navigation a {
+  color: #d9d9d9;
+  padding: 0.6em 1em 0.4em;
+}
+#navigation ul {
+  padding: 2px 0;
+}
+#navigation ul.links {
+  font-size: 105%;
+  padding: 0.6em 0.6em 4px;
+}
+#navigation ul.links li a {
+  color: #333;
+  text-shadow: 0 1px #eee;
+  background: #ccc;
+  background: rgba(255, 255, 255, 0.78);
+  border-top-left-radius: 8px;
+  -webkit-border-top-left-radius: 8px;
+  -moz-border-radius-topleft: 8px;
+  -khtml-border-radius-topleft: 8px;
+  border-top-right-radius: 8px;
+  -webkit-border-top-right-radius: 8px;
+  -moz-border-radius-topright: 8px;
+  -khtml-border-radius-topright: 8px;
+  border-bottom: 1px solid #fff;
+}
+#navigation ul.links li a:hover {
+  background: #fff;
+  background: rgba(255, 255, 255, 0.95);
+}
+#navigation ul.links li a:active {
+  background: #b3b3b3;
+  background: rgba(255, 255, 255, 1);
+}
+#navigation ul.links li.active-trail a {
+  background: #fff;
+  background: rgba(255, 255, 255, 1.0);
+  border-bottom: none;
+}
+.featured #navigation ul.links li.active-trail a {
+  background: #f0f0f0;
+  background: rgba(240, 240, 240, 1.0);
+}
+#navigation ul.links li {
+  display: inline;
+  list-style-type: none;
+  padding: 0.6em 0 0.4em;
+}
+#navigation ul.links li.first {
+  padding-left: 2px;
+}
+
+/**
+ * Main
+ */
+#main {
+  margin-top: 20px;
+  margin-bottom: 40px;
+}
+.field-type-image {
+  float: left;
+  padding: 2px 20px 5px 0;
+}
+
+/**
+ * Featured
+ */
+#featured {
+  text-align: center;
+  font-size: 180%;
+  font-weight: normal;
+  line-height: 1.4em;
+  padding: 50px 0 45px;
+  margin: 0;
+  background: #f0f0f0;
+  border-bottom: 1px solid #e7e7e7;
+  text-shadow: 1px 1px #fff;
+}
+#featured p {
+  margin: 0;
+  padding: 0;
+}
+
+/**
+ * Content
+ */
+#block-system-main {
+  font-size: 115%;
+  line-height: 1.5em;
+}
+h1#page-title {
+  font-size: 220%;
+}
+#block-system-main h2 {
+  margin-bottom: 2px;
+  font-size: 137%;
+}
+#block-system-main .node-teaser h2 a {
+  color: #181818;
+}
+#block-system-main .node-teaser {
+  border-bottom: 1px solid #d3d7d9;
+  margin-bottom: 30px;
+  padding-bottom: 15px;
+}
+#block-system-main .node-teaser .content {
+  font-size: 92%;
+  line-height: 1.65em;
+  color: #3b3b3b;
+  clear: none;
+}
+#block-system-main div.user-picture img {
+  margin-left: 20px;
+}
+#block-system-main .meta {
+  font-family: Arial, sans-serif;
+  font-size: 80%;
+  color: #a8a8a8;
+  margin-bottom: -5px;
+}
+#block-system-main .submitted img {
+  float: right;
+}
+#block-system-main img {
+  margin: 0 0 15px;
+  border: 1px solid #d3d7d9;
+}
+#block-system-main .node-teaser img {
+  margin: 0;
+}
+#block-system-main div.field-name-taxonomy-tags div.field-label,
+#block-system-main div.field-name-taxonomy-tags div.field-items,
+#block-system-main div.field-name-taxonomy-tags div.field-item {
+  font-family: Arial, sans-serif;
+  display: inline;
+  float: left;
+  padding-right: 10px;
+  font-weight: normal;
+}
+#block-system-main div.field-name-taxonomy-tags div.field-label {
+  font-size: 86%;
+  color: #68696b;
+}
+#block-system-main div.field-name-taxonomy-tags div.field-items,
+#block-system-main div.field-name-taxonomy-tags div.field-item {
+  font-size: 95%;
+}
+#block-system-main div.field-name-taxonomy-tags a:hover {
+  text-decoration: underline;
+}
+#block-system-main .link-wrapper {
+  margin-left: 236px;
+}
+#block-system-main ul.links {
+  font-family: Arial, sans-serif;
+  color: #68696b;
+  font-size: 80%;  
+}
+
+/**
+ * Comments
+ */
+#comment-wrapper {
+  border-top: 1px solid #d3d7d9;
+  padding-top: 15px;
+}
+#comment-wrapper h2.comments {
+  margin-bottom: 1em;
+}
+.node-teaser #comment-wrapper {
+  display: none;
+}
+#comment-wrapper  div.user-picture img {
+  margin-left: 0;
+}
+#comments .comment {
+  margin-bottom: 20px;
+}
+#comments .attribution {
+  float: left;
+  width: 110px;
+}
+#comments .attribution img {
+  margin: 0;
+  border: 1px solid #d3d7d9;
+}
+#comments .submitted p {
+  margin: 4px 0;
+  font-family: Arial, sans-serif;
+  font-size: 110%;
+  line-height: 1.2em;
+}
+#comments .submitted .comment-time {
+  font-size: 70%;
+  color: #68696b;
+}
+#comments .content {
+  font-size: 90%;
+}
+#comments .comment-arrow {
+  background: url(../images/comment-arrow.gif);
+  height: 40px;
+  width: 20px;
+  margin-left: -45px;
+  margin-top: 10px;
+  position: absolute;
+}
+#comments .comment-text {
+  margin-left: 140px;
+  padding: 10px 25px;
+  border: 1px solid #d3d7d9;
+}
+#comments .indented {
+  margin-left: 40px;
+}
+
+/**
+ * Sidebar
+ */
+.sidebar .block {
+  padding: 15px 20px;
+  margin: 20px 0;
+  border: 1px solid #dcdcdc; 
+  -webkit-border: 1px solid #e0e0e0; 
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  background: #f0f0f0;
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 95%, from(rgba(247, 247, 247, 1)), to(rgba(240, 240, 240, 1)));
+}
+.sidebar h2 {
+  margin: 0 0 0.5em;
+  border-bottom: 1px solid #d6d6d6; 
+  padding-bottom: 5px;
+  text-shadow: 0 1px 0 #fff;
+}
+.sidebar tbody {
+  border: none;
+}
+.sidebar tr.even, 
+.sidebar tr.odd {
+  background: none;
+  border-bottom: 1px solid #d6d6d6; 
+}
+
+/**
+ * Triptych
+ */
+#triptych-wrapper {
+  background: #fafafa url(images/triptych-background.jpg) repeat-x top center;
+  border-top: 1px solid #d3d7d9;
+}
+#triptych h2 {
+  color: #000;
+  font-size: 200%;
+  margin-bottom: 1em;
+  text-align: center;
+  text-shadow: 0px 1px 0 #fff;
+}
+
+/**
+ * Footer
+ */
+#footer-wrapper {
+  background: #161617 url(images/footer-background.jpg) repeat-x top center;
+  color: #7c7e84;
+  font-size: 90%;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+#footer-wrapper a {
+  color: #7c7e84;
+}
+#footer-wrapper a:hover {
+  color: #b7b8b8;
+}
+#footer-wrapper div.block {
+  margin: 20px 0;
+  border: 1px solid #38393b;
+  padding: 10px;
+}
+#footer-wrapper #block-system-main-menu,
+#footer-wrapper #block-system-secondary-menu,
+#footer-wrapper .section div.block-menu,
+#footer-wrapper #footer .block {
+  margin: 0;
+  padding: 0;
+  border: none;
+}
+#footer-wrapper h2 {
+  border-bottom: 1px solid #38393b;
+  color: #7c7e84;
+  font-size: 104%;
+  margin-bottom: 0;
+  padding-bottom: 3px;
+  text-transform: uppercase;
+}
+#footer-wrapper ul {
+  list-style: none;
+  padding-left: 0;
+  margin-left: 0
+}
+#footer-wrapper li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+#footer-wrapper li a {
+  display: block;
+  border-bottom: 1px solid #38393b;
+  line-height: 1.2em;
+  padding: 0.8em 2px 0.8em 20px;
+  text-indent: -15px;
+}
+#footer-wrapper li a:hover {
+  background: #1f1f21;
+}
+#footer {
+  text-align: center;
+  font-size: 92%;
+  letter-spacing: 0.2px;
+  color: #5a5b5d;
+  margin-top: 30px;
+  border-top: 1px solid #333436;
+}
+#footer .region {
+  margin-top: 20px;
+}
+#footer a {
+  color: #5a5b5d;
+  border-bottom: 1px dotted #5a5b5d;
+}
+#footer a:hover {
+  border-bottom: 1px dotted #5a5b5d;
+}
+
+/**
+ * System tabs
+ */
+div.tabs {
+  margin-bottom: 20px;
+}
+div.tabs ul.primary {
+  padding: 10px 0 3px 1em;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+div.tabs ul.primary li a {
+  border-top-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  -khtml-border-radius-topleft: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -khtml-border-radius-topright: 6px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+}
+
+/**
+ * Messages
+ */
+#messages {
+  padding: 20px 0 5px;
+}
+div.messages {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+div.status {
+  background: #fcf6be;
+  border: 1px solid #bbb;
+  margin: 0 auto;
+  padding: 15px;
+  width: 900px;
+}
+div.error {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  margin: 20px auto;
+  padding: 20px;
+  width: 900px;
+}
+.region-featured #messages {
+  background: #d2d2d2;
+}
+
+/**
+ * User profile
+ */
+.profile .user-picture {
+  float: none;
+}
+
+/**
+ * Form elements
+ */
+fieldset {
+  background: #fbfbfb none repeat scroll 0 0;
+  border: 1px solid #ccc;
+  padding: 10px 25px;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+}
+fieldset.collapsed {
+  background: #fff;
+  border-radius: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -khtml-border-radius: 0;
+}
+input {
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px;
+  margin: 2px 0;
+  padding: 4px;
+}
+input.form-submit {
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px;
+  margin: 2px 0;
+  padding: 3px;
+  background: #fff;
+}
+#user-profile-form input#edit-submit {
+  margin-left: 500px;
+}
+.password-suggestions ul li {
+  margin-left: 1.2em;
+}
+.form-item {
+  margin-bottom: 1em;
+  margin-top: 2px;
+}
+.form-item label {
+  font-size: 90%;
+}
+fieldset .description {
+  margin-top: 5px;
+  line-height: 1.4em;
+  color: #3c3c3c;
+  font-style: italic;
+}
+
+/**
+ * Other overrides
+ */
+div.password-suggestions {
+  border: 0;
+}
+.ui-widget-overlay {
+  background: #222222;
+  opacity: 0.7;
+}