Index: themes/bartik/.DS_Store =================================================================== RCS file: themes/bartik/.DS_Store diff -N themes/bartik/.DS_Store Binary files /dev/null and .DS_Store differ Index: themes/bartik/README.txt =================================================================== RCS file: themes/bartik/README.txt diff -N themes/bartik/README.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/README.txt 31 Jan 2010 13:47:49 -0000 @@ -0,0 +1,33 @@ +// $Id$ + +EDITING THIS THEME + +You can customize this theme to make it more your own. But do not edit this +original copy of Bartik. Duplicate the Bartik directory (the folder) with all of +it's files, move your new copy to the sites/all/themes directory, and edit it there. +Be sure to rename your new theme by changing the name of the directory, changing +the name of the .info file, and editing the text inside the .info file. + +If you are running a multisite installation, you can place the new theme in in a +subdirectory under /sites/{sitename}/themes/, where {sitename} is the name of your +site (e.g., www.example.com). + +If you edit this copy of Bartik, you are "hacking core". Do not hack core. + +If you hack core, and edit the original copy of Bartik, updating Drupal will be +much harder, and you risk having your new theme deleted in the process. + +For more details, see: http://drupal.org/node/176043 + + +CHANGING THE COLOR.CSS FILE + +If you adjust the colors using the color scheme tool in Bartik's theme settings, +the color.css file will be duplicated and the new copy will be placed in +default/sites/files/. It is this new copy that will have the CSS for the colors +you specified. The original copy of color.css will stay in themes/bartik/css/, +but will no longer have any impact on the site's display. + +If you are having trouble making changes directly to the stylesheet, if you are +making changes but they aren't having an effect, then try turning color module +off in the modules administration area. \ No newline at end of file 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 1 Feb 2010 15:35:15 -0000 @@ -0,0 +1,33 @@ +;$Id$ + +name = Bartik +description = A flexible, recolorable theme with many regions. +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 1 Feb 2010 15:17:16 -0000 @@ -0,0 +1,48 @@ + +
+
> + type != 'forum'): ?> +

+ + + + + +

+
+ +
+ +
+
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 1 Feb 2010 15:17:43 -0000 @@ -0,0 +1,102 @@ +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() + */ +?> +
> + +
+ + + + +
+ +
+
+ + + + + + + > + + +
> + + +
+ +
+ +
+ + +
+
Index: themes/bartik/html.tpl.php =================================================================== RCS file: themes/bartik/html.tpl.php diff -N themes/bartik/html.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/html.tpl.php 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1,57 @@ +language contains its textual representation. + * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'. + * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document. + * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data. + * - $head_title: A modified version of the page title, for use in the TITLE tag. + * - $head: Markup for the HEAD section (including meta tags, keyword tags, and + * so on). + * - $styles: Style tags necessary to import all CSS files for the page. + * - $scripts: Script tags necessary to load the JavaScript files and settings + * for the page. + * - $page_top: Initial markup from any modules that have altered the + * page. This variable should always be output first, before all other dynamic + * content. + * - $page: The rendered page content. + * - $page_bottom: Final closing markup from any modules that have altered the + * page. This variable should always be output last, after all other dynamic + * content. + * - $classes String of classes that can be used to style contextually through + * CSS. + * + * @see template_preprocess() + * @see template_preprocess_html() + * @see template_process() + */ +?> +> + + + + <?php print $head_title; ?> + + + +> + + + + + + Index: themes/bartik/logo.png =================================================================== RCS file: themes/bartik/logo.png diff -N themes/bartik/logo.png Binary files /dev/null and logo.png differ Index: themes/bartik/maintenance-page.tpl.php =================================================================== RCS file: themes/bartik/maintenance-page.tpl.php diff -N themes/bartik/maintenance-page.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/maintenance-page.tpl.php 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1,97 @@ + + + + + + <?php print $head_title; ?> + + + + + + +
+ + +
+ + + + + +
+ +
+

+ +
+ +
+
+ +
+ + + + + +
+ + + +
+ + + 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 1 Feb 2010 15:23:35 -0000 @@ -0,0 +1,131 @@ +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() + */ +?> +
> + + + + > + + + + + + +
+ + + + + + +
+ +
+ + +
+ + +
> + +
+ + + + + + + +
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 1 Feb 2010 15:27:01 -0000 @@ -0,0 +1,230 @@ + +
+ + + + +
+ +
+ + + + + + +
+ + + + + +
+
+ + + +

+ +

+ + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + +
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+ + + + +
\ No newline at end of file Index: themes/bartik/screenshot.png =================================================================== RCS file: themes/bartik/screenshot.png diff -N themes/bartik/screenshot.png Binary files /dev/null and screenshot.png differ 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 1 Feb 2010 15:27:17 -0000 @@ -0,0 +1,62 @@ +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 1 Feb 2010 15:27:23 -0000 @@ -0,0 +1,28 @@ + '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/.git/COMMIT_EDITMSG =================================================================== RCS file: themes/bartik/.git/COMMIT_EDITMSG diff -N themes/bartik/.git/COMMIT_EDITMSG --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/COMMIT_EDITMSG 1 Feb 2010 15:56:07 -0000 @@ -0,0 +1 @@ +merging all the changes from the last few days. This should be everything (except for what I'm not willing to do.) Index: themes/bartik/.git/FETCH_HEAD =================================================================== RCS file: themes/bartik/.git/FETCH_HEAD diff -N themes/bartik/.git/FETCH_HEAD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/FETCH_HEAD 31 Jan 2010 13:53:05 -0000 @@ -0,0 +1 @@ +ac7fbd2a7cde637f29b872c759d4dcff822a48a1 branch 'master' of github.com:jensimmons/Bartik Index: themes/bartik/.git/HEAD =================================================================== RCS file: themes/bartik/.git/HEAD diff -N themes/bartik/.git/HEAD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/HEAD 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1 @@ +ref: refs/heads/master Index: themes/bartik/.git/ORIG_HEAD =================================================================== RCS file: themes/bartik/.git/ORIG_HEAD diff -N themes/bartik/.git/ORIG_HEAD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/ORIG_HEAD 31 Jan 2010 13:53:05 -0000 @@ -0,0 +1 @@ +5ad2b5ce0fcf2a48b0349bb5142b60bd25faaece Index: themes/bartik/.git/config =================================================================== RCS file: themes/bartik/.git/config diff -N themes/bartik/.git/config --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/config 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1,12 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + fetch = +refs/heads/*:refs/remotes/origin/* + url = git@github.com:jensimmons/Bartik.git +[branch "master"] + remote = origin + merge = refs/heads/master Index: themes/bartik/.git/description =================================================================== RCS file: themes/bartik/.git/description diff -N themes/bartik/.git/description --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/description 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. Index: themes/bartik/.git/index =================================================================== RCS file: themes/bartik/.git/index diff -N themes/bartik/.git/index Binary files /dev/null and index differ Index: themes/bartik/.git/packed-refs =================================================================== RCS file: themes/bartik/.git/packed-refs diff -N themes/bartik/.git/packed-refs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/packed-refs 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1,2 @@ +# pack-refs with: peeled +242e7e6dbe31a899e6f549034334c1cf941f443d refs/remotes/origin/master Index: themes/bartik/.git/hooks/applypatch-msg.sample =================================================================== RCS file: themes/bartik/.git/hooks/applypatch-msg.sample diff -N themes/bartik/.git/hooks/applypatch-msg.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/applypatch-msg.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: Index: themes/bartik/.git/hooks/commit-msg.sample =================================================================== RCS file: themes/bartik/.git/hooks/commit-msg.sample diff -N themes/bartik/.git/hooks/commit-msg.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/commit-msg.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by git-commit with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} Index: themes/bartik/.git/hooks/post-commit.sample =================================================================== RCS file: themes/bartik/.git/hooks/post-commit.sample diff -N themes/bartik/.git/hooks/post-commit.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/post-commit.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script that is called after a successful +# commit is made. +# +# To enable this hook, rename this file to "post-commit". + +: Nothing Index: themes/bartik/.git/hooks/post-receive.sample =================================================================== RCS file: themes/bartik/.git/hooks/post-receive.sample diff -N themes/bartik/.git/hooks/post-receive.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/post-receive.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script for the "post-receive" event. +# +# The "post-receive" script is run after receive-pack has accepted a pack +# and the repository has been updated. It is passed arguments in through +# stdin in the form +# +# For example: +# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master +# +# see contrib/hooks/ for a sample, or uncomment the next line and +# rename the file to "post-receive". + +#. /usr/share/doc/git-core/contrib/hooks/post-receive-email Index: themes/bartik/.git/hooks/post-update.sample =================================================================== RCS file: themes/bartik/.git/hooks/post-update.sample diff -N themes/bartik/.git/hooks/post-update.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/post-update.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git-update-server-info Index: themes/bartik/.git/hooks/pre-applypatch.sample =================================================================== RCS file: themes/bartik/.git/hooks/pre-applypatch.sample diff -N themes/bartik/.git/hooks/pre-applypatch.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/pre-applypatch.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: Index: themes/bartik/.git/hooks/pre-commit.sample =================================================================== RCS file: themes/bartik/.git/hooks/pre-commit.sample diff -N themes/bartik/.git/hooks/pre-commit.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/pre-commit.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,46 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by git-commit with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +# If you want to allow non-ascii filenames set this variable to true. +allownonascii=$(git config hooks.allownonascii) + +# Cross platform projects tend to avoid non-ascii filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test "$(git diff --cached --name-only --diff-filter=A -z | + LC_ALL=C tr -d '[ -~]\0')" +then + echo "Error: Attempt to add a non-ascii file name." + echo + echo "This can cause problems if you want to work" + echo "with people on other platforms." + echo + echo "To be portable it is advisable to rename the file ..." + echo + echo "If you know what you are doing you can disable this" + echo "check using:" + echo + echo " git config hooks.allownonascii true" + echo + exit 1 +fi + +if git-rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +exec git diff-index --check --cached $against -- Index: themes/bartik/.git/hooks/pre-rebase.sample =================================================================== RCS file: themes/bartik/.git/hooks/pre-rebase.sample diff -N themes/bartik/.git/hooks/pre-rebase.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/pre-rebase.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git-rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git-rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git-rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git-rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git-rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git-rev-list --pretty=oneline ^${publish} "$topic"` + perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git-rev-list ^master ^topic next + git-rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git-rev-list master..topic + + if this is empty, it is fully merged to "master". Index: themes/bartik/.git/hooks/prepare-commit-msg.sample =================================================================== RCS file: themes/bartik/.git/hooks/prepare-commit-msg.sample diff -N themes/bartik/.git/hooks/prepare-commit-msg.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/prepare-commit-msg.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by git-commit with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" Index: themes/bartik/.git/hooks/update.sample =================================================================== RCS file: themes/bartik/.git/hooks/update.sample diff -N themes/bartik/.git/hooks/update.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/hooks/update.sample 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by git-receive-pack with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git-cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 Index: themes/bartik/.git/info/exclude =================================================================== RCS file: themes/bartik/.git/info/exclude diff -N themes/bartik/.git/info/exclude --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/info/exclude 30 Jan 2010 23:27:08 -0000 @@ -0,0 +1,7 @@ +# git-ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store Index: themes/bartik/.git/logs/HEAD =================================================================== RCS file: themes/bartik/.git/logs/HEAD diff -N themes/bartik/.git/logs/HEAD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/logs/HEAD 1 Feb 2010 15:56:07 -0000 @@ -0,0 +1,20 @@ +0000000000000000000000000000000000000000 242e7e6dbe31a899e6f549034334c1cf941f443d jensimmons 1264894030 -0500 clone: from git@github.com:jensimmons/Bartik.git +242e7e6dbe31a899e6f549034334c1cf941f443d a72fada706493bbb374d77187f05926795aeec0b jensimmons 1264897558 -0500 commit: Committing Theresa Summa's schemes +a72fada706493bbb374d77187f05926795aeec0b 63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 jensimmons 1264897590 -0500 commit: Removing 2nd sidebar, clearing out other things that don't belong in the patchable version +63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 3828f237d97328b726622fe622b6d0ea63389891 jensimmons 1264909366 -0500 commit: Changed color module setup, putting color css in a separate sheet. Mid-way through layout changes. Done a bunch of other stuff. +3828f237d97328b726622fe622b6d0ea63389891 86d1b349d1df66c23db09b0d363f33b6f14c2f1e jensimmons 1264912107 -0500 commit: Getting rid of the reminants of 960.gs, replacing layout css with non-framwork teachniques +86d1b349d1df66c23db09b0d363f33b6f14c2f1e 2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 jensimmons 1264912136 -0500 pull origin: Merge made by recursive. +2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 cca6367bae65bd5ae774800875cb17b6babd3e2b jensimmons 1264912194 -0500 commit: deleting 960.gs +cca6367bae65bd5ae774800875cb17b6babd3e2b 0fcde43b2711855174889d80f1736320a6601536 jensimmons 1264913081 -0500 commit: Rolling in some of dickolsson's changes. +0fcde43b2711855174889d80f1736320a6601536 370e571ec9e72df9938bea9f35ba6301fd18ce7f jensimmons 1264913328 -0500 commit: More changes by dickolsson. Had to apply manually, because the fork pull failed. +370e571ec9e72df9938bea9f35ba6301fd18ce7f 675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 jensimmons 1264914134 -0500 commit: moe format changes from dickolsson +675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 d08a2837bfc92ae06ea4f410a26731051cb39f05 jensimmons 1264915869 -0500 commit: Changed message styles as per this issue: http://drupal.org/node/700304 +d08a2837bfc92ae06ea4f410a26731051cb39f05 40bfdafb66c208f2ab188b85efa4fc3c81ce5992 jensimmons 1264917980 -0500 commit: dmitrig's changes to create the ability to change the 'published by ' text as a theme setting. +40bfdafb66c208f2ab188b85efa4fc3c81ce5992 3925837d42743cce07875a3b0a8b92605e027088 jensimmons 1264943214 -0500 commit: Wrote help text. +3925837d42743cce07875a3b0a8b92605e027088 c87c1c44f9cc5a9f39c20ad4458095abed555334 jensimmons 1264943229 -0500 commit: spacing cleanups +c87c1c44f9cc5a9f39c20ad4458095abed555334 6c96a0d9b9b566fed1771f73d32a34e5634dfc81 jensimmons 1264944534 -0500 commit: Spacing cleanups and more. +6c96a0d9b9b566fed1771f73d32a34e5634dfc81 1515a492b32a38638483044292a077ff2da8f25a jensimmons 1264945300 -0500 commit: Manually rolling back changes from Dmitrig for the author info edit tool +1515a492b32a38638483044292a077ff2da8f25a 5ad2b5ce0fcf2a48b0349bb5142b60bd25faaece jensimmons 1264945687 -0500 commit: clean up of readme +5ad2b5ce0fcf2a48b0349bb5142b60bd25faaece 44d4b4336459b38695c6c8d9b4fb2b1e0556d43a jensimmons 1264948618 -0500 commit (merge): Spacing cleanups, and some typography adjustments +44d4b4336459b38695c6c8d9b4fb2b1e0556d43a 04bdc1bb741dc246f47a32115fa6f95ff5547d5f jensimmons 1264948663 -0500 commit: Spacing cleanups +04bdc1bb741dc246f47a32115fa6f95ff5547d5f 5e3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 jensimmons 1265039767 -0500 commit: merging all the changes from the last few days. This should be everything (except for what I'm not willing to do.) Index: themes/bartik/.git/logs/refs/heads/master =================================================================== RCS file: themes/bartik/.git/logs/refs/heads/master diff -N themes/bartik/.git/logs/refs/heads/master --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/logs/refs/heads/master 1 Feb 2010 15:56:07 -0000 @@ -0,0 +1,20 @@ +0000000000000000000000000000000000000000 242e7e6dbe31a899e6f549034334c1cf941f443d jensimmons 1264894030 -0500 clone: from git@github.com:jensimmons/Bartik.git +242e7e6dbe31a899e6f549034334c1cf941f443d a72fada706493bbb374d77187f05926795aeec0b jensimmons 1264897558 -0500 commit: Committing Theresa Summa's schemes +a72fada706493bbb374d77187f05926795aeec0b 63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 jensimmons 1264897590 -0500 commit: Removing 2nd sidebar, clearing out other things that don't belong in the patchable version +63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 3828f237d97328b726622fe622b6d0ea63389891 jensimmons 1264909366 -0500 commit: Changed color module setup, putting color css in a separate sheet. Mid-way through layout changes. Done a bunch of other stuff. +3828f237d97328b726622fe622b6d0ea63389891 86d1b349d1df66c23db09b0d363f33b6f14c2f1e jensimmons 1264912107 -0500 commit: Getting rid of the reminants of 960.gs, replacing layout css with non-framwork teachniques +86d1b349d1df66c23db09b0d363f33b6f14c2f1e 2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 jensimmons 1264912136 -0500 pull origin: Merge made by recursive. +2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 cca6367bae65bd5ae774800875cb17b6babd3e2b jensimmons 1264912194 -0500 commit: deleting 960.gs +cca6367bae65bd5ae774800875cb17b6babd3e2b 0fcde43b2711855174889d80f1736320a6601536 jensimmons 1264913081 -0500 commit: Rolling in some of dickolsson's changes. +0fcde43b2711855174889d80f1736320a6601536 370e571ec9e72df9938bea9f35ba6301fd18ce7f jensimmons 1264913328 -0500 commit: More changes by dickolsson. Had to apply manually, because the fork pull failed. +370e571ec9e72df9938bea9f35ba6301fd18ce7f 675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 jensimmons 1264914134 -0500 commit: moe format changes from dickolsson +675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 d08a2837bfc92ae06ea4f410a26731051cb39f05 jensimmons 1264915869 -0500 commit: Changed message styles as per this issue: http://drupal.org/node/700304 +d08a2837bfc92ae06ea4f410a26731051cb39f05 40bfdafb66c208f2ab188b85efa4fc3c81ce5992 jensimmons 1264917980 -0500 commit: dmitrig's changes to create the ability to change the 'published by ' text as a theme setting. +40bfdafb66c208f2ab188b85efa4fc3c81ce5992 3925837d42743cce07875a3b0a8b92605e027088 jensimmons 1264943214 -0500 commit: Wrote help text. +3925837d42743cce07875a3b0a8b92605e027088 c87c1c44f9cc5a9f39c20ad4458095abed555334 jensimmons 1264943229 -0500 commit: spacing cleanups +c87c1c44f9cc5a9f39c20ad4458095abed555334 6c96a0d9b9b566fed1771f73d32a34e5634dfc81 jensimmons 1264944534 -0500 commit: Spacing cleanups and more. +6c96a0d9b9b566fed1771f73d32a34e5634dfc81 1515a492b32a38638483044292a077ff2da8f25a jensimmons 1264945300 -0500 commit: Manually rolling back changes from Dmitrig for the author info edit tool +1515a492b32a38638483044292a077ff2da8f25a 5ad2b5ce0fcf2a48b0349bb5142b60bd25faaece jensimmons 1264945687 -0500 commit: clean up of readme +5ad2b5ce0fcf2a48b0349bb5142b60bd25faaece 44d4b4336459b38695c6c8d9b4fb2b1e0556d43a jensimmons 1264948618 -0500 commit (merge): Spacing cleanups, and some typography adjustments +44d4b4336459b38695c6c8d9b4fb2b1e0556d43a 04bdc1bb741dc246f47a32115fa6f95ff5547d5f jensimmons 1264948663 -0500 commit: Spacing cleanups +04bdc1bb741dc246f47a32115fa6f95ff5547d5f 5e3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 jensimmons 1265039767 -0500 commit: merging all the changes from the last few days. This should be everything (except for what I'm not willing to do.) Index: themes/bartik/.git/logs/refs/remotes/origin/master =================================================================== RCS file: themes/bartik/.git/logs/refs/remotes/origin/master diff -N themes/bartik/.git/logs/refs/remotes/origin/master --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/logs/refs/remotes/origin/master 1 Feb 2010 15:56:24 -0000 @@ -0,0 +1,14 @@ +242e7e6dbe31a899e6f549034334c1cf941f443d 63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 Jen Simmons 1264897596 -0500 update by push +63bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 3828f237d97328b726622fe622b6d0ea63389891 Jen Simmons 1264909374 -0500 update by push +3828f237d97328b726622fe622b6d0ea63389891 fb63120fbc77a2b1187eba9191aca1231061021c jensimmons 1264912136 -0500 pull origin: fast forward +fb63120fbc77a2b1187eba9191aca1231061021c 2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 Jen Simmons 1264912149 -0500 update by push +2540fbf5c98cc689921e90ca7b1e1b7bd6cdd179 cca6367bae65bd5ae774800875cb17b6babd3e2b Jen Simmons 1264912199 -0500 update by push +cca6367bae65bd5ae774800875cb17b6babd3e2b 370e571ec9e72df9938bea9f35ba6301fd18ce7f Jen Simmons 1264913335 -0500 update by push +370e571ec9e72df9938bea9f35ba6301fd18ce7f 675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 Jen Simmons 1264914146 -0500 update by push +675bfb9f9684c8c24f4eed9d8f0a0908594b2c65 d08a2837bfc92ae06ea4f410a26731051cb39f05 Jen Simmons 1264915874 -0500 update by push +d08a2837bfc92ae06ea4f410a26731051cb39f05 c87c1c44f9cc5a9f39c20ad4458095abed555334 Jen Simmons 1264943235 -0500 update by push +c87c1c44f9cc5a9f39c20ad4458095abed555334 6c96a0d9b9b566fed1771f73d32a34e5634dfc81 Jen Simmons 1264944539 -0500 update by push +6c96a0d9b9b566fed1771f73d32a34e5634dfc81 ac7fbd2a7cde637f29b872c759d4dcff822a48a1 jensimmons 1264945471 -0500 pull --no-commit origin: fast forward +ac7fbd2a7cde637f29b872c759d4dcff822a48a1 44d4b4336459b38695c6c8d9b4fb2b1e0556d43a Jen Simmons 1264948626 -0500 update by push +44d4b4336459b38695c6c8d9b4fb2b1e0556d43a 04bdc1bb741dc246f47a32115fa6f95ff5547d5f Jen Simmons 1264948669 -0500 update by push +04bdc1bb741dc246f47a32115fa6f95ff5547d5f 5e3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 Jen Simmons 1265039783 -0500 update by push Index: themes/bartik/.git/objects/04/bdc1bb741dc246f47a32115fa6f95ff5547d5f =================================================================== RCS file: themes/bartik/.git/objects/04/bdc1bb741dc246f47a32115fa6f95ff5547d5f diff -N themes/bartik/.git/objects/04/bdc1bb741dc246f47a32115fa6f95ff5547d5f Binary files /dev/null and bdc1bb741dc246f47a32115fa6f95ff5547d5f differ Index: themes/bartik/.git/objects/05/1e672106127dc735fcfb2fe4432a56bf112438 =================================================================== RCS file: themes/bartik/.git/objects/05/1e672106127dc735fcfb2fe4432a56bf112438 diff -N themes/bartik/.git/objects/05/1e672106127dc735fcfb2fe4432a56bf112438 Binary files /dev/null and 1e672106127dc735fcfb2fe4432a56bf112438 differ Index: themes/bartik/.git/objects/08/51810fc808a2f74ebe2dfb8f7beacb9f4dd87a =================================================================== RCS file: themes/bartik/.git/objects/08/51810fc808a2f74ebe2dfb8f7beacb9f4dd87a diff -N themes/bartik/.git/objects/08/51810fc808a2f74ebe2dfb8f7beacb9f4dd87a Binary files /dev/null and 51810fc808a2f74ebe2dfb8f7beacb9f4dd87a differ Index: themes/bartik/.git/objects/0f/cde43b2711855174889d80f1736320a6601536 =================================================================== RCS file: themes/bartik/.git/objects/0f/cde43b2711855174889d80f1736320a6601536 diff -N themes/bartik/.git/objects/0f/cde43b2711855174889d80f1736320a6601536 Binary files /dev/null and cde43b2711855174889d80f1736320a6601536 differ Index: themes/bartik/.git/objects/10/6a9b13889b7a777dbf6f72c8c68c83e02aa7d9 =================================================================== RCS file: themes/bartik/.git/objects/10/6a9b13889b7a777dbf6f72c8c68c83e02aa7d9 diff -N themes/bartik/.git/objects/10/6a9b13889b7a777dbf6f72c8c68c83e02aa7d9 Binary files /dev/null and 6a9b13889b7a777dbf6f72c8c68c83e02aa7d9 differ Index: themes/bartik/.git/objects/15/15a492b32a38638483044292a077ff2da8f25a =================================================================== RCS file: themes/bartik/.git/objects/15/15a492b32a38638483044292a077ff2da8f25a diff -N themes/bartik/.git/objects/15/15a492b32a38638483044292a077ff2da8f25a Binary files /dev/null and 15a492b32a38638483044292a077ff2da8f25a differ Index: themes/bartik/.git/objects/18/9a3e4339cd5b39f408a1ba0ee51243492f7b8d =================================================================== RCS file: themes/bartik/.git/objects/18/9a3e4339cd5b39f408a1ba0ee51243492f7b8d diff -N themes/bartik/.git/objects/18/9a3e4339cd5b39f408a1ba0ee51243492f7b8d Binary files /dev/null and 9a3e4339cd5b39f408a1ba0ee51243492f7b8d differ Index: themes/bartik/.git/objects/19/d527516f669070388f0db7e1cc88019ed1312c =================================================================== RCS file: themes/bartik/.git/objects/19/d527516f669070388f0db7e1cc88019ed1312c diff -N themes/bartik/.git/objects/19/d527516f669070388f0db7e1cc88019ed1312c Binary files /dev/null and d527516f669070388f0db7e1cc88019ed1312c differ Index: themes/bartik/.git/objects/1c/5e7db80de502d5cbdc49161f934534108828bb =================================================================== RCS file: themes/bartik/.git/objects/1c/5e7db80de502d5cbdc49161f934534108828bb diff -N themes/bartik/.git/objects/1c/5e7db80de502d5cbdc49161f934534108828bb Binary files /dev/null and 5e7db80de502d5cbdc49161f934534108828bb differ Index: themes/bartik/.git/objects/1c/859bd4427f67290f7079c4c6d4bd1a38fe1268 =================================================================== RCS file: themes/bartik/.git/objects/1c/859bd4427f67290f7079c4c6d4bd1a38fe1268 diff -N themes/bartik/.git/objects/1c/859bd4427f67290f7079c4c6d4bd1a38fe1268 Binary files /dev/null and 859bd4427f67290f7079c4c6d4bd1a38fe1268 differ Index: themes/bartik/.git/objects/1f/589512adb10f2cbf97e7574768e6a1b8390024 =================================================================== RCS file: themes/bartik/.git/objects/1f/589512adb10f2cbf97e7574768e6a1b8390024 diff -N themes/bartik/.git/objects/1f/589512adb10f2cbf97e7574768e6a1b8390024 Binary files /dev/null and 589512adb10f2cbf97e7574768e6a1b8390024 differ Index: themes/bartik/.git/objects/25/0193a00baa8a3f9043a2a8eeb6777bda8b774e =================================================================== RCS file: themes/bartik/.git/objects/25/0193a00baa8a3f9043a2a8eeb6777bda8b774e diff -N themes/bartik/.git/objects/25/0193a00baa8a3f9043a2a8eeb6777bda8b774e Binary files /dev/null and 0193a00baa8a3f9043a2a8eeb6777bda8b774e differ Index: themes/bartik/.git/objects/25/40fbf5c98cc689921e90ca7b1e1b7bd6cdd179 =================================================================== RCS file: themes/bartik/.git/objects/25/40fbf5c98cc689921e90ca7b1e1b7bd6cdd179 diff -N themes/bartik/.git/objects/25/40fbf5c98cc689921e90ca7b1e1b7bd6cdd179 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/25/40fbf5c98cc689921e90ca7b1e1b7bd6cdd179 31 Jan 2010 04:28:56 -0000 @@ -0,0 +1 @@ +xN0 Fv6!CiEiwZKWF𐄳0fو#4l=-]-.bv. E^t$GH\0~0@%3 袎ҷ:n@9- +hHE|CQGA:%h N7RazH]Rb1>8CQbhFop{~9l ~c!KD</_ڷ΀?mZhB/P97/sa \ No newline at end of file Index: themes/bartik/.git/objects/39/25837d42743cce07875a3b0a8b92605e027088 =================================================================== RCS file: themes/bartik/.git/objects/39/25837d42743cce07875a3b0a8b92605e027088 diff -N themes/bartik/.git/objects/39/25837d42743cce07875a3b0a8b92605e027088 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/39/25837d42743cce07875a3b0a8b92605e027088 31 Jan 2010 13:06:54 -0000 @@ -0,0 +1,2 @@ +xK +0@]sK~M& -\O[1M<ܻ{p;Ka \ No newline at end of file Index: themes/bartik/.git/objects/3a/8485371bdf12642eada56b6b866bdcdf20a99d =================================================================== RCS file: themes/bartik/.git/objects/3a/8485371bdf12642eada56b6b866bdcdf20a99d diff -N themes/bartik/.git/objects/3a/8485371bdf12642eada56b6b866bdcdf20a99d Binary files /dev/null and 8485371bdf12642eada56b6b866bdcdf20a99d differ Index: themes/bartik/.git/objects/3e/1688ccf83b40cc08fa191b26578fcc32f48fcf =================================================================== RCS file: themes/bartik/.git/objects/3e/1688ccf83b40cc08fa191b26578fcc32f48fcf diff -N themes/bartik/.git/objects/3e/1688ccf83b40cc08fa191b26578fcc32f48fcf Binary files /dev/null and 1688ccf83b40cc08fa191b26578fcc32f48fcf differ Index: themes/bartik/.git/objects/40/bfdafb66c208f2ab188b85efa4fc3c81ce5992 =================================================================== RCS file: themes/bartik/.git/objects/40/bfdafb66c208f2ab188b85efa4fc3c81ce5992 diff -N themes/bartik/.git/objects/40/bfdafb66c208f2ab188b85efa4fc3c81ce5992 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/40/bfdafb66c208f2ab188b85efa4fc3c81ce5992 31 Jan 2010 06:06:20 -0000 @@ -0,0 +1,4 @@ +x;n0 DS\eMYHA*L +,ː@qI產E +3XN#y~q@;kkC!L|]UsRC`ACѳ 81 aPHt98* 86t-ƔQ/~9}W^/ +Kn-qm++H_A6rqxIX7^=o@mb,l"[-~~e펼p7#*cY|o \ No newline at end of file Index: themes/bartik/.git/objects/41/c0e6068d26f0be45d71b381b0ead1cfc780b72 =================================================================== RCS file: themes/bartik/.git/objects/41/c0e6068d26f0be45d71b381b0ead1cfc780b72 diff -N themes/bartik/.git/objects/41/c0e6068d26f0be45d71b381b0ead1cfc780b72 Binary files /dev/null and c0e6068d26f0be45d71b381b0ead1cfc780b72 differ Index: themes/bartik/.git/objects/42/ae27c8c376d934d157e70e5c5cab806d04b102 =================================================================== RCS file: themes/bartik/.git/objects/42/ae27c8c376d934d157e70e5c5cab806d04b102 diff -N themes/bartik/.git/objects/42/ae27c8c376d934d157e70e5c5cab806d04b102 Binary files /dev/null and ae27c8c376d934d157e70e5c5cab806d04b102 differ Index: themes/bartik/.git/objects/43/7b9ea996a8d4bdf06ba56cb384a81d8d120afa =================================================================== RCS file: themes/bartik/.git/objects/43/7b9ea996a8d4bdf06ba56cb384a81d8d120afa diff -N themes/bartik/.git/objects/43/7b9ea996a8d4bdf06ba56cb384a81d8d120afa --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/43/7b9ea996a8d4bdf06ba56cb384a81d8d120afa 31 Jan 2010 00:25:58 -0000 @@ -0,0 +1,2 @@ +x}Sۊ0sb$8%- ,=EHJ8ɒP+Ff̙\fm&(^_Jpcq ˓%VBa ڀ-ܡ}p?O(:Od:]aIZE{Ws'w^=yΊ9K2g7(rZ+(Xق%ly1OӪ#$;֫&cj̾|;[>M "ߞ- R]``C8׀̅7ĺızłl1cG؅nt4 ԵO|6đ;b+ /*WGF,K0hPԍzU)Cn[_5I"WxW(oqq w`(,L)-P*jD[<`^Q!3XAUNECKT;*XbF8DqS y{i +jFUO^ĎtNN:Ϯh~yb- 9F;U+MzFC \ No newline at end of file Index: themes/bartik/.git/objects/44/d4b4336459b38695c6c8d9b4fb2b1e0556d43a =================================================================== RCS file: themes/bartik/.git/objects/44/d4b4336459b38695c6c8d9b4fb2b1e0556d43a diff -N themes/bartik/.git/objects/44/d4b4336459b38695c6c8d9b4fb2b1e0556d43a Binary files /dev/null and d4b4336459b38695c6c8d9b4fb2b1e0556d43a differ Index: themes/bartik/.git/objects/47/4db8a827c15b635d5563a78403890637b71858 =================================================================== RCS file: themes/bartik/.git/objects/47/4db8a827c15b635d5563a78403890637b71858 diff -N themes/bartik/.git/objects/47/4db8a827c15b635d5563a78403890637b71858 Binary files /dev/null and 4db8a827c15b635d5563a78403890637b71858 differ Index: themes/bartik/.git/objects/47/df4623d4a1e45b096d230c629ebcdf710251a8 =================================================================== RCS file: themes/bartik/.git/objects/47/df4623d4a1e45b096d230c629ebcdf710251a8 diff -N themes/bartik/.git/objects/47/df4623d4a1e45b096d230c629ebcdf710251a8 Binary files /dev/null and df4623d4a1e45b096d230c629ebcdf710251a8 differ Index: themes/bartik/.git/objects/47/e5a17a931d058f35090b2085671be411131b9c =================================================================== RCS file: themes/bartik/.git/objects/47/e5a17a931d058f35090b2085671be411131b9c diff -N themes/bartik/.git/objects/47/e5a17a931d058f35090b2085671be411131b9c Binary files /dev/null and e5a17a931d058f35090b2085671be411131b9c differ Index: themes/bartik/.git/objects/58/0456c6dc9480e58a46b9ad0941a26f8351a716 =================================================================== RCS file: themes/bartik/.git/objects/58/0456c6dc9480e58a46b9ad0941a26f8351a716 diff -N themes/bartik/.git/objects/58/0456c6dc9480e58a46b9ad0941a26f8351a716 Binary files /dev/null and 0456c6dc9480e58a46b9ad0941a26f8351a716 differ Index: themes/bartik/.git/objects/58/a0151b0bccd86ace1603a6ee04081f36a5a341 =================================================================== RCS file: themes/bartik/.git/objects/58/a0151b0bccd86ace1603a6ee04081f36a5a341 diff -N themes/bartik/.git/objects/58/a0151b0bccd86ace1603a6ee04081f36a5a341 Binary files /dev/null and a0151b0bccd86ace1603a6ee04081f36a5a341 differ Index: themes/bartik/.git/objects/5a/d2b5ce0fcf2a48b0349bb5142b60bd25faaece =================================================================== RCS file: themes/bartik/.git/objects/5a/d2b5ce0fcf2a48b0349bb5142b60bd25faaece diff -N themes/bartik/.git/objects/5a/d2b5ce0fcf2a48b0349bb5142b60bd25faaece --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/5a/d2b5ce0fcf2a48b0349bb5142b60bd25faaece 31 Jan 2010 13:48:07 -0000 @@ -0,0 +1 @@ +xA E]shbW`54-ݹw^su^&F13%":` rVd`Eltjp@!##zV|w#>ږ|U[n S p^kubbgp)J \ No newline at end of file Index: themes/bartik/.git/objects/5e/3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 =================================================================== RCS file: themes/bartik/.git/objects/5e/3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 diff -N themes/bartik/.git/objects/5e/3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/5e/3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 1 Feb 2010 15:56:07 -0000 @@ -0,0 +1,2 @@ +x9N1D?Z^۲)90!!'+=U\+%ML?̎Z:F3㵗#ʑl: DX卑JP؂P3Je0[2)2,2cp:R)x{1)7lk)x!ĉ +/&gESwz+ 1!>c0bdf7<=n\X ה0>/?m \ No newline at end of file Index: themes/bartik/.git/objects/61/521607302c2d060640d1077561b17947f1fef3 =================================================================== RCS file: themes/bartik/.git/objects/61/521607302c2d060640d1077561b17947f1fef3 diff -N themes/bartik/.git/objects/61/521607302c2d060640d1077561b17947f1fef3 Binary files /dev/null and 521607302c2d060640d1077561b17947f1fef3 differ Index: themes/bartik/.git/objects/62/1d66330ac7e292c16200167a7e6b2ef731a0cd =================================================================== RCS file: themes/bartik/.git/objects/62/1d66330ac7e292c16200167a7e6b2ef731a0cd diff -N themes/bartik/.git/objects/62/1d66330ac7e292c16200167a7e6b2ef731a0cd Binary files /dev/null and 1d66330ac7e292c16200167a7e6b2ef731a0cd differ Index: themes/bartik/.git/objects/62/60cb002e4f39e92ccc453083a6ae833b4f09df =================================================================== RCS file: themes/bartik/.git/objects/62/60cb002e4f39e92ccc453083a6ae833b4f09df diff -N themes/bartik/.git/objects/62/60cb002e4f39e92ccc453083a6ae833b4f09df Binary files /dev/null and 60cb002e4f39e92ccc453083a6ae833b4f09df differ Index: themes/bartik/.git/objects/62/b59c59c51081113ff4f6f519dfd27afa99d0d9 =================================================================== RCS file: themes/bartik/.git/objects/62/b59c59c51081113ff4f6f519dfd27afa99d0d9 diff -N themes/bartik/.git/objects/62/b59c59c51081113ff4f6f519dfd27afa99d0d9 Binary files /dev/null and b59c59c51081113ff4f6f519dfd27afa99d0d9 differ Index: themes/bartik/.git/objects/63/bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 =================================================================== RCS file: themes/bartik/.git/objects/63/bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 diff -N themes/bartik/.git/objects/63/bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/63/bc4b65422054ab73267c7b6fdc1cb6c4ae4d61 31 Jan 2010 00:26:30 -0000 @@ -0,0 +1 @@ +x=n! FS)ܥI"?)rC4TS^kaPB gryHŦeB\ 52cB+UA-Y:X(>YjϿZ/Xٜ xZeY_˅jv%Q :99!3Rڔ7c84&eq \ No newline at end of file Index: themes/bartik/.git/objects/64/c858943362d55116056ad9e18223e778d20fb9 =================================================================== RCS file: themes/bartik/.git/objects/64/c858943362d55116056ad9e18223e778d20fb9 diff -N themes/bartik/.git/objects/64/c858943362d55116056ad9e18223e778d20fb9 Binary files /dev/null and c858943362d55116056ad9e18223e778d20fb9 differ Index: themes/bartik/.git/objects/67/5bfb9f9684c8c24f4eed9d8f0a0908594b2c65 =================================================================== RCS file: themes/bartik/.git/objects/67/5bfb9f9684c8c24f4eed9d8f0a0908594b2c65 diff -N themes/bartik/.git/objects/67/5bfb9f9684c8c24f4eed9d8f0a0908594b2c65 Binary files /dev/null and 5bfb9f9684c8c24f4eed9d8f0a0908594b2c65 differ Index: themes/bartik/.git/objects/6c/96a0d9b9b566fed1771f73d32a34e5634dfc81 =================================================================== RCS file: themes/bartik/.git/objects/6c/96a0d9b9b566fed1771f73d32a34e5634dfc81 diff -N themes/bartik/.git/objects/6c/96a0d9b9b566fed1771f73d32a34e5634dfc81 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/6c/96a0d9b9b566fed1771f73d32a34e5634dfc81 31 Jan 2010 13:28:54 -0000 @@ -0,0 +1,2 @@ +xK +0@]sKoD'LbҦ;<9/ /mb`[Ehل1 &{vnBfO8Ydit=%:EG{ R%Zv1gZ>|go\Z\lW+RfP9&%N \ No newline at end of file Index: themes/bartik/.git/objects/6c/f6190f2af3a36baebb915ab3f1e4483937a4ec =================================================================== RCS file: themes/bartik/.git/objects/6c/f6190f2af3a36baebb915ab3f1e4483937a4ec diff -N themes/bartik/.git/objects/6c/f6190f2af3a36baebb915ab3f1e4483937a4ec Binary files /dev/null and f6190f2af3a36baebb915ab3f1e4483937a4ec differ Index: themes/bartik/.git/objects/70/85d557c8bf8c546fea99c4092c5f6bef5fad6f =================================================================== RCS file: themes/bartik/.git/objects/70/85d557c8bf8c546fea99c4092c5f6bef5fad6f diff -N themes/bartik/.git/objects/70/85d557c8bf8c546fea99c4092c5f6bef5fad6f Binary files /dev/null and 85d557c8bf8c546fea99c4092c5f6bef5fad6f differ Index: themes/bartik/.git/objects/70/e606f3d0b572c69bf3f0fbd1f03df155e513b2 =================================================================== RCS file: themes/bartik/.git/objects/70/e606f3d0b572c69bf3f0fbd1f03df155e513b2 diff -N themes/bartik/.git/objects/70/e606f3d0b572c69bf3f0fbd1f03df155e513b2 Binary files /dev/null and e606f3d0b572c69bf3f0fbd1f03df155e513b2 differ Index: themes/bartik/.git/objects/73/7622411878a937aab273dedd0eaf0cbf3af3db =================================================================== RCS file: themes/bartik/.git/objects/73/7622411878a937aab273dedd0eaf0cbf3af3db diff -N themes/bartik/.git/objects/73/7622411878a937aab273dedd0eaf0cbf3af3db Binary files /dev/null and 7622411878a937aab273dedd0eaf0cbf3af3db differ Index: themes/bartik/.git/objects/75/cb2db7ef3307af7eb19b8fc29fc6930a5ec1a8 =================================================================== RCS file: themes/bartik/.git/objects/75/cb2db7ef3307af7eb19b8fc29fc6930a5ec1a8 diff -N themes/bartik/.git/objects/75/cb2db7ef3307af7eb19b8fc29fc6930a5ec1a8 Binary files /dev/null and cb2db7ef3307af7eb19b8fc29fc6930a5ec1a8 differ Index: themes/bartik/.git/objects/76/7f3707a036a87966a0a483f53aa61836f3ae21 =================================================================== RCS file: themes/bartik/.git/objects/76/7f3707a036a87966a0a483f53aa61836f3ae21 diff -N themes/bartik/.git/objects/76/7f3707a036a87966a0a483f53aa61836f3ae21 Binary files /dev/null and 7f3707a036a87966a0a483f53aa61836f3ae21 differ Index: themes/bartik/.git/objects/7f/648c58e3bf7f57128d21b56330ef5587776f49 =================================================================== RCS file: themes/bartik/.git/objects/7f/648c58e3bf7f57128d21b56330ef5587776f49 diff -N themes/bartik/.git/objects/7f/648c58e3bf7f57128d21b56330ef5587776f49 Binary files /dev/null and 648c58e3bf7f57128d21b56330ef5587776f49 differ Index: themes/bartik/.git/objects/83/0c306da6147939a041fb215415aa78249af112 =================================================================== RCS file: themes/bartik/.git/objects/83/0c306da6147939a041fb215415aa78249af112 diff -N themes/bartik/.git/objects/83/0c306da6147939a041fb215415aa78249af112 Binary files /dev/null and 0c306da6147939a041fb215415aa78249af112 differ Index: themes/bartik/.git/objects/85/e5103ed25346a94060d5b928651e9dd435c4d0 =================================================================== RCS file: themes/bartik/.git/objects/85/e5103ed25346a94060d5b928651e9dd435c4d0 diff -N themes/bartik/.git/objects/85/e5103ed25346a94060d5b928651e9dd435c4d0 Binary files /dev/null and e5103ed25346a94060d5b928651e9dd435c4d0 differ Index: themes/bartik/.git/objects/86/d1b349d1df66c23db09b0d363f33b6f14c2f1e =================================================================== RCS file: themes/bartik/.git/objects/86/d1b349d1df66c23db09b0d363f33b6f14c2f1e diff -N themes/bartik/.git/objects/86/d1b349d1df66c23db09b0d363f33b6f14c2f1e Binary files /dev/null and d1b349d1df66c23db09b0d363f33b6f14c2f1e differ Index: themes/bartik/.git/objects/87/32305ff38f1c862549ff0452daa13675e6e6da =================================================================== RCS file: themes/bartik/.git/objects/87/32305ff38f1c862549ff0452daa13675e6e6da diff -N themes/bartik/.git/objects/87/32305ff38f1c862549ff0452daa13675e6e6da Binary files /dev/null and 32305ff38f1c862549ff0452daa13675e6e6da differ Index: themes/bartik/.git/objects/88/b546656f84713314bf591180ce1651639dcd5f =================================================================== RCS file: themes/bartik/.git/objects/88/b546656f84713314bf591180ce1651639dcd5f diff -N themes/bartik/.git/objects/88/b546656f84713314bf591180ce1651639dcd5f Binary files /dev/null and b546656f84713314bf591180ce1651639dcd5f differ Index: themes/bartik/.git/objects/94/bbc3bda9b5442e3a2bfb25029dabd8be709750 =================================================================== RCS file: themes/bartik/.git/objects/94/bbc3bda9b5442e3a2bfb25029dabd8be709750 diff -N themes/bartik/.git/objects/94/bbc3bda9b5442e3a2bfb25029dabd8be709750 Binary files /dev/null and bbc3bda9b5442e3a2bfb25029dabd8be709750 differ Index: themes/bartik/.git/objects/95/5b2b6c1ca5f11219ed3fce20797345119e6fa8 =================================================================== RCS file: themes/bartik/.git/objects/95/5b2b6c1ca5f11219ed3fce20797345119e6fa8 diff -N themes/bartik/.git/objects/95/5b2b6c1ca5f11219ed3fce20797345119e6fa8 Binary files /dev/null and 5b2b6c1ca5f11219ed3fce20797345119e6fa8 differ Index: themes/bartik/.git/objects/98/ffe4b38be5ac80c550409731238aff6e6e6231 =================================================================== RCS file: themes/bartik/.git/objects/98/ffe4b38be5ac80c550409731238aff6e6e6231 diff -N themes/bartik/.git/objects/98/ffe4b38be5ac80c550409731238aff6e6e6231 Binary files /dev/null and ffe4b38be5ac80c550409731238aff6e6e6231 differ Index: themes/bartik/.git/objects/9e/e1bbaa0ca3173a9b272b71b88bdeb6998b5af2 =================================================================== RCS file: themes/bartik/.git/objects/9e/e1bbaa0ca3173a9b272b71b88bdeb6998b5af2 diff -N themes/bartik/.git/objects/9e/e1bbaa0ca3173a9b272b71b88bdeb6998b5af2 Binary files /dev/null and e1bbaa0ca3173a9b272b71b88bdeb6998b5af2 differ Index: themes/bartik/.git/objects/9f/d09ccf22745e9b5cb46d35001419e57584e510 =================================================================== RCS file: themes/bartik/.git/objects/9f/d09ccf22745e9b5cb46d35001419e57584e510 diff -N themes/bartik/.git/objects/9f/d09ccf22745e9b5cb46d35001419e57584e510 Binary files /dev/null and d09ccf22745e9b5cb46d35001419e57584e510 differ Index: themes/bartik/.git/objects/a0/13f8ad54bebc7b0c3aebf83f627f753101cad2 =================================================================== RCS file: themes/bartik/.git/objects/a0/13f8ad54bebc7b0c3aebf83f627f753101cad2 diff -N themes/bartik/.git/objects/a0/13f8ad54bebc7b0c3aebf83f627f753101cad2 Binary files /dev/null and 13f8ad54bebc7b0c3aebf83f627f753101cad2 differ Index: themes/bartik/.git/objects/a6/2239932b699bb6075b955f53233b256c6e8b95 =================================================================== RCS file: themes/bartik/.git/objects/a6/2239932b699bb6075b955f53233b256c6e8b95 diff -N themes/bartik/.git/objects/a6/2239932b699bb6075b955f53233b256c6e8b95 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/a6/2239932b699bb6075b955f53233b256c6e8b95 31 Jan 2010 00:25:58 -0000 @@ -0,0 +1 @@ +x+)JMU045d040031QHJ,N+Kgn_kÛΑ᪪Tcnj_\=oW~^el/AEez >5gnuQ7= de۩W%kŲݡ-LNA \ No newline at end of file Index: themes/bartik/.git/objects/a7/2fada706493bbb374d77187f05926795aeec0b =================================================================== RCS file: themes/bartik/.git/objects/a7/2fada706493bbb374d77187f05926795aeec0b diff -N themes/bartik/.git/objects/a7/2fada706493bbb374d77187f05926795aeec0b --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/a7/2fada706493bbb374d77187f05926795aeec0b 31 Jan 2010 00:25:58 -0000 @@ -0,0 +1,3 @@ +xM +0`9\) A/Ҥ½}rFc0h:: i3(ЇZi[]ׯ-T"V/P@LEP \ No newline at end of file Index: themes/bartik/.git/objects/a9/9eb99a85b432c0b7f6d357f0e679985a971baf =================================================================== RCS file: themes/bartik/.git/objects/a9/9eb99a85b432c0b7f6d357f0e679985a971baf diff -N themes/bartik/.git/objects/a9/9eb99a85b432c0b7f6d357f0e679985a971baf Binary files /dev/null and 9eb99a85b432c0b7f6d357f0e679985a971baf differ Index: themes/bartik/.git/objects/aa/ffa571abff1d6724bfc00188fe763b4383061b =================================================================== RCS file: themes/bartik/.git/objects/aa/ffa571abff1d6724bfc00188fe763b4383061b diff -N themes/bartik/.git/objects/aa/ffa571abff1d6724bfc00188fe763b4383061b Binary files /dev/null and ffa571abff1d6724bfc00188fe763b4383061b differ Index: themes/bartik/.git/objects/ab/0a6cfe3e11bb121997748dc5c6ae10e193d328 =================================================================== RCS file: themes/bartik/.git/objects/ab/0a6cfe3e11bb121997748dc5c6ae10e193d328 diff -N themes/bartik/.git/objects/ab/0a6cfe3e11bb121997748dc5c6ae10e193d328 Binary files /dev/null and 0a6cfe3e11bb121997748dc5c6ae10e193d328 differ Index: themes/bartik/.git/objects/ac/077826c327e9fb7e0373c267c766e69bfb6998 =================================================================== RCS file: themes/bartik/.git/objects/ac/077826c327e9fb7e0373c267c766e69bfb6998 diff -N themes/bartik/.git/objects/ac/077826c327e9fb7e0373c267c766e69bfb6998 Binary files /dev/null and 077826c327e9fb7e0373c267c766e69bfb6998 differ Index: themes/bartik/.git/objects/ac/7fbd2a7cde637f29b872c759d4dcff822a48a1 =================================================================== RCS file: themes/bartik/.git/objects/ac/7fbd2a7cde637f29b872c759d4dcff822a48a1 diff -N themes/bartik/.git/objects/ac/7fbd2a7cde637f29b872c759d4dcff822a48a1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/ac/7fbd2a7cde637f29b872c759d4dcff822a48a1 31 Jan 2010 13:44:31 -0000 @@ -0,0 +1,2 @@ +xMJ0E]+f/HҤApL;&4 .\95hUhr wYodP{ѐz*.0OQX;3lF2V&4@v;*-\6jG:^ +R#|.R9۷gD,gZ˿N ۭrUt?4N \ No newline at end of file Index: themes/bartik/.git/objects/b0/0caf8aee5ce49df2acfc036c71aea94efbf2e7 =================================================================== RCS file: themes/bartik/.git/objects/b0/0caf8aee5ce49df2acfc036c71aea94efbf2e7 diff -N themes/bartik/.git/objects/b0/0caf8aee5ce49df2acfc036c71aea94efbf2e7 Binary files /dev/null and 0caf8aee5ce49df2acfc036c71aea94efbf2e7 differ Index: themes/bartik/.git/objects/b2/d48ed5892803c6ed2dadfbe9aa63e3897363f8 =================================================================== RCS file: themes/bartik/.git/objects/b2/d48ed5892803c6ed2dadfbe9aa63e3897363f8 diff -N themes/bartik/.git/objects/b2/d48ed5892803c6ed2dadfbe9aa63e3897363f8 Binary files /dev/null and d48ed5892803c6ed2dadfbe9aa63e3897363f8 differ Index: themes/bartik/.git/objects/b9/2d8fd061e547eadb5bc4816e66e9ddccb90821 =================================================================== RCS file: themes/bartik/.git/objects/b9/2d8fd061e547eadb5bc4816e66e9ddccb90821 diff -N themes/bartik/.git/objects/b9/2d8fd061e547eadb5bc4816e66e9ddccb90821 Binary files /dev/null and 2d8fd061e547eadb5bc4816e66e9ddccb90821 differ Index: themes/bartik/.git/objects/ba/9396fef37ca4941ab06b68b296467b4e48adc2 =================================================================== RCS file: themes/bartik/.git/objects/ba/9396fef37ca4941ab06b68b296467b4e48adc2 diff -N themes/bartik/.git/objects/ba/9396fef37ca4941ab06b68b296467b4e48adc2 Binary files /dev/null and 9396fef37ca4941ab06b68b296467b4e48adc2 differ Index: themes/bartik/.git/objects/bd/b4707aa774f90afcad84c1377fb2eccea122c3 =================================================================== RCS file: themes/bartik/.git/objects/bd/b4707aa774f90afcad84c1377fb2eccea122c3 diff -N themes/bartik/.git/objects/bd/b4707aa774f90afcad84c1377fb2eccea122c3 Binary files /dev/null and b4707aa774f90afcad84c1377fb2eccea122c3 differ Index: themes/bartik/.git/objects/bd/ebdc4a6c8535d71af25c72025f3271b9f3f9c8 =================================================================== RCS file: themes/bartik/.git/objects/bd/ebdc4a6c8535d71af25c72025f3271b9f3f9c8 diff -N themes/bartik/.git/objects/bd/ebdc4a6c8535d71af25c72025f3271b9f3f9c8 Binary files /dev/null and ebdc4a6c8535d71af25c72025f3271b9f3f9c8 differ Index: themes/bartik/.git/objects/c1/4f68bfadc58cfdc6c53cd4fe04a700a701eba2 =================================================================== RCS file: themes/bartik/.git/objects/c1/4f68bfadc58cfdc6c53cd4fe04a700a701eba2 diff -N themes/bartik/.git/objects/c1/4f68bfadc58cfdc6c53cd4fe04a700a701eba2 Binary files /dev/null and 4f68bfadc58cfdc6c53cd4fe04a700a701eba2 differ Index: themes/bartik/.git/objects/c1/a7f20585545edde652b742e4dbce537ee91718 =================================================================== RCS file: themes/bartik/.git/objects/c1/a7f20585545edde652b742e4dbce537ee91718 diff -N themes/bartik/.git/objects/c1/a7f20585545edde652b742e4dbce537ee91718 Binary files /dev/null and a7f20585545edde652b742e4dbce537ee91718 differ Index: themes/bartik/.git/objects/c2/9d20c8edec5d8da19141725c2cb2cb83ccdee0 =================================================================== RCS file: themes/bartik/.git/objects/c2/9d20c8edec5d8da19141725c2cb2cb83ccdee0 diff -N themes/bartik/.git/objects/c2/9d20c8edec5d8da19141725c2cb2cb83ccdee0 Binary files /dev/null and 9d20c8edec5d8da19141725c2cb2cb83ccdee0 differ Index: themes/bartik/.git/objects/c4/34294f12e4e86f3f796fe394db49bdc1850d44 =================================================================== RCS file: themes/bartik/.git/objects/c4/34294f12e4e86f3f796fe394db49bdc1850d44 diff -N themes/bartik/.git/objects/c4/34294f12e4e86f3f796fe394db49bdc1850d44 Binary files /dev/null and 34294f12e4e86f3f796fe394db49bdc1850d44 differ Index: themes/bartik/.git/objects/c7/130d6e8461b130f4880408ef841b0b5ec3b1df =================================================================== RCS file: themes/bartik/.git/objects/c7/130d6e8461b130f4880408ef841b0b5ec3b1df diff -N themes/bartik/.git/objects/c7/130d6e8461b130f4880408ef841b0b5ec3b1df Binary files /dev/null and 130d6e8461b130f4880408ef841b0b5ec3b1df differ Index: themes/bartik/.git/objects/c8/59f30c74d54b01a04c660504d3407b1899df1b =================================================================== RCS file: themes/bartik/.git/objects/c8/59f30c74d54b01a04c660504d3407b1899df1b diff -N themes/bartik/.git/objects/c8/59f30c74d54b01a04c660504d3407b1899df1b Binary files /dev/null and 59f30c74d54b01a04c660504d3407b1899df1b differ Index: themes/bartik/.git/objects/c8/7c1c44f9cc5a9f39c20ad4458095abed555334 =================================================================== RCS file: themes/bartik/.git/objects/c8/7c1c44f9cc5a9f39c20ad4458095abed555334 diff -N themes/bartik/.git/objects/c8/7c1c44f9cc5a9f39c20ad4458095abed555334 Binary files /dev/null and 7c1c44f9cc5a9f39c20ad4458095abed555334 differ Index: themes/bartik/.git/objects/cc/a6367bae65bd5ae774800875cb17b6babd3e2b =================================================================== RCS file: themes/bartik/.git/objects/cc/a6367bae65bd5ae774800875cb17b6babd3e2b diff -N themes/bartik/.git/objects/cc/a6367bae65bd5ae774800875cb17b6babd3e2b Binary files /dev/null and a6367bae65bd5ae774800875cb17b6babd3e2b differ Index: themes/bartik/.git/objects/cd/ddde84f3d8a0d1b6401d1a75376813559c98b8 =================================================================== RCS file: themes/bartik/.git/objects/cd/ddde84f3d8a0d1b6401d1a75376813559c98b8 diff -N themes/bartik/.git/objects/cd/ddde84f3d8a0d1b6401d1a75376813559c98b8 Binary files /dev/null and ddde84f3d8a0d1b6401d1a75376813559c98b8 differ Index: themes/bartik/.git/objects/cd/f352c58285f0dfa5b57ad348fb8bc6b8c067be =================================================================== RCS file: themes/bartik/.git/objects/cd/f352c58285f0dfa5b57ad348fb8bc6b8c067be diff -N themes/bartik/.git/objects/cd/f352c58285f0dfa5b57ad348fb8bc6b8c067be Binary files /dev/null and f352c58285f0dfa5b57ad348fb8bc6b8c067be differ Index: themes/bartik/.git/objects/ce/51d871e137fee9245133cf6af469fe4b8087df =================================================================== RCS file: themes/bartik/.git/objects/ce/51d871e137fee9245133cf6af469fe4b8087df diff -N themes/bartik/.git/objects/ce/51d871e137fee9245133cf6af469fe4b8087df Binary files /dev/null and 51d871e137fee9245133cf6af469fe4b8087df differ Index: themes/bartik/.git/objects/cf/f3f1e9dfda99e6faf5129b7892aaa18b3d291b =================================================================== RCS file: themes/bartik/.git/objects/cf/f3f1e9dfda99e6faf5129b7892aaa18b3d291b diff -N themes/bartik/.git/objects/cf/f3f1e9dfda99e6faf5129b7892aaa18b3d291b Binary files /dev/null and f3f1e9dfda99e6faf5129b7892aaa18b3d291b differ Index: themes/bartik/.git/objects/d0/8a2837bfc92ae06ea4f410a26731051cb39f05 =================================================================== RCS file: themes/bartik/.git/objects/d0/8a2837bfc92ae06ea4f410a26731051cb39f05 diff -N themes/bartik/.git/objects/d0/8a2837bfc92ae06ea4f410a26731051cb39f05 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/d0/8a2837bfc92ae06ea4f410a26731051cb39f05 31 Jan 2010 05:31:09 -0000 @@ -0,0 +1 @@ +x;n0S{XK_ $,%(TG]tVk S\8fCv2hK`QHڨN[m2KѡUNbK;^jm[~՗[.t\Y"uqпdmz3A:UKPz?cq~ch2w]- \ No newline at end of file Index: themes/bartik/.git/objects/d1/de956a034857e56ea325fe5dbdb9700e24cf7f =================================================================== RCS file: themes/bartik/.git/objects/d1/de956a034857e56ea325fe5dbdb9700e24cf7f diff -N themes/bartik/.git/objects/d1/de956a034857e56ea325fe5dbdb9700e24cf7f Binary files /dev/null and de956a034857e56ea325fe5dbdb9700e24cf7f differ Index: themes/bartik/.git/objects/d4/02f71e1ac0fce7961a8c6cf7ea995bab134a5b =================================================================== RCS file: themes/bartik/.git/objects/d4/02f71e1ac0fce7961a8c6cf7ea995bab134a5b diff -N themes/bartik/.git/objects/d4/02f71e1ac0fce7961a8c6cf7ea995bab134a5b Binary files /dev/null and 02f71e1ac0fce7961a8c6cf7ea995bab134a5b differ Index: themes/bartik/.git/objects/d5/73f75bdf2c87875de728da16b83792d4618e4d =================================================================== RCS file: themes/bartik/.git/objects/d5/73f75bdf2c87875de728da16b83792d4618e4d diff -N themes/bartik/.git/objects/d5/73f75bdf2c87875de728da16b83792d4618e4d Binary files /dev/null and 73f75bdf2c87875de728da16b83792d4618e4d differ Index: themes/bartik/.git/objects/e1/4d29209adb5718482f87ddca07d29c4136640d =================================================================== RCS file: themes/bartik/.git/objects/e1/4d29209adb5718482f87ddca07d29c4136640d diff -N themes/bartik/.git/objects/e1/4d29209adb5718482f87ddca07d29c4136640d Binary files /dev/null and 4d29209adb5718482f87ddca07d29c4136640d differ Index: themes/bartik/.git/objects/e1/79f829593a743931ef1dcd110cb6897e7c3376 =================================================================== RCS file: themes/bartik/.git/objects/e1/79f829593a743931ef1dcd110cb6897e7c3376 diff -N themes/bartik/.git/objects/e1/79f829593a743931ef1dcd110cb6897e7c3376 Binary files /dev/null and 79f829593a743931ef1dcd110cb6897e7c3376 differ Index: themes/bartik/.git/objects/e9/15cb0ef18ed46d82464c5fdf623cb279464fd0 =================================================================== RCS file: themes/bartik/.git/objects/e9/15cb0ef18ed46d82464c5fdf623cb279464fd0 diff -N themes/bartik/.git/objects/e9/15cb0ef18ed46d82464c5fdf623cb279464fd0 Binary files /dev/null and 15cb0ef18ed46d82464c5fdf623cb279464fd0 differ Index: themes/bartik/.git/objects/e9/4ff9290dd288c3235f3285df972207a9bfcc23 =================================================================== RCS file: themes/bartik/.git/objects/e9/4ff9290dd288c3235f3285df972207a9bfcc23 diff -N themes/bartik/.git/objects/e9/4ff9290dd288c3235f3285df972207a9bfcc23 Binary files /dev/null and 4ff9290dd288c3235f3285df972207a9bfcc23 differ Index: themes/bartik/.git/objects/e9/f79eddeb53198c8cd72a1ae51e036dd287c0c3 =================================================================== RCS file: themes/bartik/.git/objects/e9/f79eddeb53198c8cd72a1ae51e036dd287c0c3 diff -N themes/bartik/.git/objects/e9/f79eddeb53198c8cd72a1ae51e036dd287c0c3 Binary files /dev/null and f79eddeb53198c8cd72a1ae51e036dd287c0c3 differ Index: themes/bartik/.git/objects/eb/dc18873b107b2df213543587a854d27e435bce =================================================================== RCS file: themes/bartik/.git/objects/eb/dc18873b107b2df213543587a854d27e435bce diff -N themes/bartik/.git/objects/eb/dc18873b107b2df213543587a854d27e435bce Binary files /dev/null and dc18873b107b2df213543587a854d27e435bce differ Index: themes/bartik/.git/objects/ed/5a914ee866092e37ed1597ab4255c36ec9a780 =================================================================== RCS file: themes/bartik/.git/objects/ed/5a914ee866092e37ed1597ab4255c36ec9a780 diff -N themes/bartik/.git/objects/ed/5a914ee866092e37ed1597ab4255c36ec9a780 Binary files /dev/null and 5a914ee866092e37ed1597ab4255c36ec9a780 differ Index: themes/bartik/.git/objects/ef/6c1528ef88af8445929fe506fb58570704a678 =================================================================== RCS file: themes/bartik/.git/objects/ef/6c1528ef88af8445929fe506fb58570704a678 diff -N themes/bartik/.git/objects/ef/6c1528ef88af8445929fe506fb58570704a678 Binary files /dev/null and 6c1528ef88af8445929fe506fb58570704a678 differ Index: themes/bartik/.git/objects/f0/a5e382c6fdfcbfa8edb6a1b93d9081c1038d8e =================================================================== RCS file: themes/bartik/.git/objects/f0/a5e382c6fdfcbfa8edb6a1b93d9081c1038d8e diff -N themes/bartik/.git/objects/f0/a5e382c6fdfcbfa8edb6a1b93d9081c1038d8e Binary files /dev/null and a5e382c6fdfcbfa8edb6a1b93d9081c1038d8e differ Index: themes/bartik/.git/objects/f0/e6aa1369fe665913f5b78bfd6f974044e37238 =================================================================== RCS file: themes/bartik/.git/objects/f0/e6aa1369fe665913f5b78bfd6f974044e37238 diff -N themes/bartik/.git/objects/f0/e6aa1369fe665913f5b78bfd6f974044e37238 Binary files /dev/null and e6aa1369fe665913f5b78bfd6f974044e37238 differ Index: themes/bartik/.git/objects/f8/bac85fd0e67613159874e18ff1b90b841f0a59 =================================================================== RCS file: themes/bartik/.git/objects/f8/bac85fd0e67613159874e18ff1b90b841f0a59 diff -N themes/bartik/.git/objects/f8/bac85fd0e67613159874e18ff1b90b841f0a59 Binary files /dev/null and bac85fd0e67613159874e18ff1b90b841f0a59 differ Index: themes/bartik/.git/objects/fa/088e325147db8b98dd63ff913296d632a51814 =================================================================== RCS file: themes/bartik/.git/objects/fa/088e325147db8b98dd63ff913296d632a51814 diff -N themes/bartik/.git/objects/fa/088e325147db8b98dd63ff913296d632a51814 Binary files /dev/null and 088e325147db8b98dd63ff913296d632a51814 differ Index: themes/bartik/.git/objects/fb/63120fbc77a2b1187eba9191aca1231061021c =================================================================== RCS file: themes/bartik/.git/objects/fb/63120fbc77a2b1187eba9191aca1231061021c diff -N themes/bartik/.git/objects/fb/63120fbc77a2b1187eba9191aca1231061021c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/objects/fb/63120fbc77a2b1187eba9191aca1231061021c 31 Jan 2010 04:28:56 -0000 @@ -0,0 +1 @@ +xM!g)gf>319H)B5@#?F'Ԏ"x@(qFB'oُt mBilFL4cבRZg`9[mЋQ8?޼?WZ@}rp9v^E1wCm AVkmYhegW \ No newline at end of file Index: themes/bartik/.git/objects/fc/e797584c00992fa73917de8f7402cc930e938d =================================================================== RCS file: themes/bartik/.git/objects/fc/e797584c00992fa73917de8f7402cc930e938d diff -N themes/bartik/.git/objects/fc/e797584c00992fa73917de8f7402cc930e938d Binary files /dev/null and e797584c00992fa73917de8f7402cc930e938d differ Index: themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.idx =================================================================== RCS file: themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.idx diff -N themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.idx Binary files /dev/null and pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.idx differ Index: themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.pack =================================================================== RCS file: themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.pack diff -N themes/bartik/.git/objects/pack/pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.pack Binary files /dev/null and pack-50f6ddcf252433bb80e36cc8bfaaf46434e44295.pack differ Index: themes/bartik/.git/refs/heads/master =================================================================== RCS file: themes/bartik/.git/refs/heads/master diff -N themes/bartik/.git/refs/heads/master --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/refs/heads/master 1 Feb 2010 15:56:07 -0000 @@ -0,0 +1 @@ +5e3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 Index: themes/bartik/.git/refs/remotes/origin/HEAD =================================================================== RCS file: themes/bartik/.git/refs/remotes/origin/HEAD diff -N themes/bartik/.git/refs/remotes/origin/HEAD --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/refs/remotes/origin/HEAD 30 Jan 2010 23:27:10 -0000 @@ -0,0 +1 @@ +ref: refs/remotes/origin/master Index: themes/bartik/.git/refs/remotes/origin/master =================================================================== RCS file: themes/bartik/.git/refs/remotes/origin/master diff -N themes/bartik/.git/refs/remotes/origin/master --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/bartik/.git/refs/remotes/origin/master 1 Feb 2010 15:56:23 -0000 @@ -0,0 +1 @@ +5e3cc7f41f9087ffa15c9f6993d8d92f588ce0e0 Index: themes/bartik/color/base.png =================================================================== RCS file: themes/bartik/color/base.png diff -N themes/bartik/color/base.png Binary files /dev/null and base.png differ 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 12:42:48 -0000 @@ -0,0 +1,42 @@ + 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', +); \ No newline at end of file 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 12:43:06 -0000 @@ -0,0 +1 @@ +/* $Id$ */ \ No newline at end of file Index: themes/bartik/color/preview.png =================================================================== RCS file: themes/bartik/color/preview.png diff -N themes/bartik/color/preview.png Binary files /dev/null and preview.png differ 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 1 Feb 2010 15:17:53 -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 1 Feb 2010 15:18:49 -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; +} \ No newline at end of file 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 1 Feb 2010 15:19:06 -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: "" ""; +} \ No newline at end of file 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 1 Feb 2010 18:55:13 -0000 @@ -0,0 +1,705 @@ +/* $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, /* any menu block in the header region */ +#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; +} +#header #block-search-form { /* search block in the header region */ + float: right; + width: 24%; + margin: 8px 0; +} +#header #block-user-login { /* login block in the Header Region */ + 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; +} +#header #block-user-login #user-login-form div.item-list { /* hide create new account + email replacement password links */ + display: none; +} + + +/* --------------- Main Navigation ------------ */ + +#navigation h2 { + margin-top: 0; + display: none; +} +#navigation { + padding: 5x 15px; + clear: both; +} +#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; + font-size: 120%: +} +.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 ------------------ */ + +#content { +/* border-right:1px solid #E9E9E9;*/ +} +#block-system-main { + font-size: 115%; + line-height: 1.5em; +} +h1#page-title { + font-size: 220%; + line-height: 1.2em; +} +#block-system-main h2 { + margin-bottom: 2px; + font-size: 137%; + line-height: 1.4em; +} +#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-columns h2 { + border-bottom: 1px solid #38393b; + color: #7c7e84; + font-size: 104%; + margin-bottom: 0; + padding-bottom: 3px; + text-transform: uppercase; +} +#footer-columns ul { + list-style: none; + padding-left: 0; + margin-left: 0 +} +#footer-columns li { + list-style: none; + margin: 0; + padding: 0; +} +#footer-columns li a { + display: block; + border-bottom: 1px solid #38393b; + line-height: 1.2em; + padding: 0.8em 2px 0.8em 20px; + text-indent: -15px; +} +#footer-columns li a:hover { + background: #1f1f21; +} +#footer { + font-size: 92%; + letter-spacing: 0.2px; + color: #5a5b5d; + margin-top: 30px; + border-top: 1px solid #333436; +} +#footer p { + text-align: center; +} +#footer .region { + margin-top: 20px; +} +#footer a:link, +#footer a:visited { + color: #787878; +} +#footer a:hover { + color: #b0b0b0; +} +#footer a:active { + color: #fff; +} +#footer .block { + clear: both; +} +#footer ul, /* any menu block in the header region */ +#footer li { + list-style: none; + margin: 0; + padding: 0; +} +#footer li a { + float: left; + padding: 0 12px; + display: block; + border-right: 1px solid #555; +} +#footer li.first a { + padding-left: 0; +} +#footer li.last a { + padding-right: 0; + border-right: none; +} + + +/* --------------- 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: 1px solid #ababab; + margin: 10px 0; + padding: 5px; + background: #ebebeb; +} +input.form-submit:hover { + background: #dedede; +} +#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; +} Index: themes/bartik/images/comment-arrow.gif =================================================================== RCS file: themes/bartik/images/comment-arrow.gif diff -N themes/bartik/images/comment-arrow.gif Binary files /dev/null and comment-arrow.gif differ Index: themes/bartik/images/footer-background.jpg =================================================================== RCS file: themes/bartik/images/footer-background.jpg diff -N themes/bartik/images/footer-background.jpg Binary files /dev/null and footer-background.jpg differ Index: themes/bartik/images/triptych-background.jpg =================================================================== RCS file: themes/bartik/images/triptych-background.jpg diff -N themes/bartik/images/triptych-background.jpg Binary files /dev/null and triptych-background.jpg differ