Index: Canvas/hex_canvas.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/Attic/hex_canvas.info,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 hex_canvas.info
--- Canvas/hex_canvas.info	8 Jun 2010 11:53:58 -0000	1.1.2.2
+++ Canvas/hex_canvas.info	27 Dec 2010 07:45:35 -0000
@@ -35,31 +35,37 @@ stylesheets[all][]   = canvas-color.css
 
 ; BLOCK REGIONS
 ; ----- region key --------- region label ------------------------------------
-regions[header]            = Header
 regions[dashboard]         = Dashboard
-regions[sidebar]           = Sidebar
+regions[header]            = Header
+regions[header_tabs]       = Header Tabs
+regions[sidebar]           = Sidebar Top
 regions[sidebar_accordion] = Sidebar Accordion
 regions[sidebar_tabs]      = Sidebar Tabs
-regions[content]           = Content Main
+regions[sidebar_bottom]    = Sidebar Bottom
 regions[content_accordion] = Content Accordion
 regions[content_tabs]      = Content Tabs
+regions[content]           = Content Main
 regions[footer]            = Footer
 
 
 ; Enable region fx. (plugin: fxAccordion & fxTabs -part of regionfx)
 ; ------ fx key -------------- region key ------------------------------------
+regionfx[fxAccordion][]      = dashboard
 regionfx[fxAccordion][]      = sidebar_accordion
 regionfx[fxAccordion][]      = content_accordion
-regionfx[fxAccordion][]      = dashboard
+regionfx[fxTabs][]           = header_tabs
 regionfx[fxTabs][]           = sidebar_tabs
 regionfx[fxTabs][]           = content_tabs
 
 ; Allows grouping of multiple regions into a common block region.
 ; The order set here is the order it's presented.
 ; ----------- group ------ region key ----------------------------------------
+region groups[header][]  = header
+region groups[header][]  = header_tabs
 region groups[sidebar][] = sidebar
 region groups[sidebar][] = sidebar_accordion
 region groups[sidebar][] = sidebar_tabs
+region groups[sidebar][] = sidebar_bottom
 region groups[content][] = content_accordion
 region groups[content][] = content_tabs
 region groups[content][] = content
Index: Canvas/images/logo.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/images/Attic/logo.png,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 logo.png
Binary files /tmp/cvsowYPqf and logo.png differ
Index: Canvas/images/screenshot.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/images/Attic/screenshot.png,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 screenshot.png
Binary files /tmp/cvs0bICwd and screenshot.png differ
Index: Canvas/styles/canvas-ie.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/canvas-ie.css,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 canvas-ie.css
--- Canvas/styles/canvas-ie.css	8 Jun 2010 11:53:58 -0000	1.1.2.2
+++ Canvas/styles/canvas-ie.css	27 Dec 2010 07:45:36 -0000
@@ -1 +1,2 @@
 /* $Id: canvas-ie.css,v 1.1.2.2 2010/06/08 11:53:58 dvessel Exp $ */
+
Index: Canvas/styles/canvas-rtl.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/canvas-rtl.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 canvas-rtl.css
--- Canvas/styles/canvas-rtl.css	8 Jun 2010 11:53:58 -0000	1.1.2.1
+++ Canvas/styles/canvas-rtl.css	27 Dec 2010 07:45:36 -0000
@@ -2,12 +2,25 @@
 
 
 /*
-** site header
+** Status messages. "ul.messages" also apply to forms.
+*/
+#status-message ul.messages {
+  float: left;
+}
+
+
+/*
+** blocks
 */
-#site-branding img.logo {
-  margin-left: 10px;
-  margin-right: 0;
+#sidebar .blocks {
+  margin-right: 0; /* LTR reset */
+  margin-left: -10px
 }
+
+
+/*
+** site header
+*/
 #search-box form#search-theme-form {
   float: left;
 }
@@ -39,9 +52,68 @@
   text-align: left;
 }
 
+
+/*
+** node
+*/
+.teaser .meta .author {
+  padding-left: 0;      /* LTR reset */
+  padding-right: .5em;
+  margin-left: 0;       /* LTR reset */
+  margin-right: .25em;
+  border-left-width: 0; /* LTR reset */
+  border-right-width: 1px;
+}
+.meta .node-type {
+  right: inherit; /* LTR reset */
+  left: 0; /* LTR */
+}
+
+ul.vocabulary li.term {
+  padding: 0 14px 0 5px;
+  background-image: url(../images/tile-a-rtl.png);
+  background-position: 100% -128px;
+  -moz-border-radius:    0;         /* LTR reset */
+  -webkit-border-radius: 0;         /* LTR reset */
+  border-radius:         0;         /* LTR reset */
+  -moz-border-radius-topleft:        3px;
+  -moz-border-radius-bottomleft:     3px;
+  -webkit-border-top-left-radius:    3px;
+  -webkit-border-bottom-left-radius: 3px;
+  border-top-left-radius:            3px;
+  border-bottom-left-radius:         3px;
+}
+
+
 /*
-** dashboard
+** menu items & lists
 */
-#sidebar ul.menu ul {
-  margin-right: 0;
+.block ul {
+  margin-left: 0; /* LTR reset */
+  margin-right: 20px;
+}
+ul.menu,
+.block ul.links {
+  margin-right: 0px;
+}
+ul.menu ul {
+  margin-left: 0; /* LTR reset*/
+  margin-right: 15px;
+}
+
+ul.menu li a {
+  padding-left: 0px; /* LTR reset */
+  padding-right: 20px;
+}
+ul.menu li > a {
+  background: url(../images/tile-a-rtl.png) no-repeat;
+}
+ul.menu li.collapsed > a {
+  background-position: 100% -66px;
+}
+ul.menu li.expanded > a {
+  background-position: 100% -84px;
+}
+ul.menu li.leaf > a {
+  background-position: 100% -102px;
 }
Index: Canvas/styles/canvas.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/canvas.css,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 canvas.css
--- Canvas/styles/canvas.css	8 Jun 2010 11:53:58 -0000	1.1.2.2
+++ Canvas/styles/canvas.css	27 Dec 2010 07:45:36 -0000
@@ -1,30 +1,14 @@
 /* $Id: canvas.css,v 1.1.2.2 2010/06/08 11:53:58 dvessel Exp $ */
 
 
-/* Common spacing set at the bottom of this file. */
-
 body {
-    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif;
+  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+  /*font-family: NanumMyeongjoOTF, NanumGothicOTF, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/
   min-width: 980px; /* prevent bg clipping with narrow viewports. */
 }
 
 
 /*
-** common transitions
-*/
-a, input, span, .form-item .description, .form-required {
-  -o-transition-property:      margin, padding, width, color, background-color;
-  -moz-transition-property:    margin, padding, width, color, background-color;
-  -webkit-transition-property: margin, padding, width, color, background-color;
-  transition-property:         margin, padding, width, color, background-color;
-  -o-transition-duration:      .25s;
-  -moz-transition-duration:    .25s;
-  -webkit-transition-duration: .25s;
-  transition-duration:         .25s;
-}
-
-
-/*
 ** links
 */
 a {
@@ -51,78 +35,136 @@ input[type=submit] {
   margin-right: .25em;
   cursor: pointer;
 }
+.container-inline input[type=button],
+.container-inline input[type=submit] {
+  padding-top: 0;
+  padding-bottom: 0;
+}
 
 
+pre {
+  overflow: auto;
+  overflow-y: hidden;
+}
+
 /*
-** applies to site links and tabs (local tasks).
+** Common transitions for bleeding edge browsers.
+** http://www.w3.org/TR/css3-transitions/
 */
-ul.primary,
-ul.secondary {
-  margin: 0;
+a, input, span, .form-item .description, .form-required, #dashboard-row {
+  -o-transition-property:      color, background-color, border-color, border-width;
+  -moz-transition-property:    color, background-color, border-color, border-width;
+  -webkit-transition-property: color, background-color, border-color, border-width;
+  transition-property:         color, background-color, border-color, border-width;
+  -o-transition-duration:      .25s;
+  -moz-transition-duration:    .25s;
+  -webkit-transition-duration: .25s;
+  transition-duration:         .25s;
+}
+
+/*
+** common spacing
+*/
+.comment-title {
+  margin-bottom: 0;
+}
+#content,
+#sidebar,
+#site-mission,
+.node-content,
+ul.pager {
+  margin-top: 1.5em;
+}
+.meta,
+.status-messages,
+.breadcrumb,
+ul.tabs,
+.help,
+.blocks,
+.block-content,
+.node-content,
+.comment-content,
+form div.warning,
+#site-mission,
+#secondary-navigation,
+#content-header {
+  margin-bottom: 1.5em;
+}
+.node,
+.comment {
+  margin-bottom: 3em;
 }
+
+
+/*
+** applies to site links and tabs (local tasks).
+*/
 .primary li,
 .secondary li {
   display: inline;
   list-style-type: none;
   padding: 0 .5em;
 }
-ul.tabs.primary,
-ul.tabs.secondary {
-  margin-left: .5em;
-}
-ul.tabs.secondary {
-  margin-top: -1em;
-}
 ul.tabs.primary li {
   padding: .1em .75em;
   -moz-border-radius:    3px;
   -webkit-border-radius: 3px;
   border-radius:         3px;
 }
-.tabs a.active {
+#content-header ul.secondary {
+  margin-top: -1em;
+}
+#content-header ul.secondary a.active {
   text-decoration: underline;
 }
 
+
 /*
-** Status messages. These also apply in forms.
+** Status messages. "ul.messages" also apply to forms.
 */
 #status-message ul.messages {
-  float: right;
+  float: right; /* LTR */
   margin-bottom: 1.5em;
+  max-width: 920px;
 }
-ul.messages {
-  padding: .25em 1em;
-  margin: 0;
-  -moz-border-radius:    5px;
-  -webkit-border-radius: 5px;
-  border-radius:         5px;
+ul.messages li {
+  padding: .25em 10px;
+  margin: 0 0 .25em;
+  -moz-border-radius:    4px;
+  -webkit-border-radius: 4px;
+  border-radius:         4px;
 }
 .messages li {
   margin: 0;
   list-style-type: none;
   text-overflow: ellipsis;
-  overflow: hidden;
-}
-.messages li:hover {
-  overflow: visible;
+  max-width: 100%;
+  overflow: auto;
+  overflow-y: hidden;
 }
 
+
 /*
 ** blocks
 */
-#page .blocks {
-  margin-bottom: 3em;
-}
-#sidebar .blocks {
-  margin-right: -1em;
-}
-#page .block {
-  padding-left: 1em;
-  padding-right: 1em;
+#sidebar .block {
+  padding: 0 10px .25em;
+  margin-bottom: 1.5em;
   -moz-border-radius:    6px;
   -webkit-border-radius: 6px;
   border-radius:         6px;
 }
+#page .block .block-title {
+  margin: 0;
+  line-height: 2em;
+  font-size: 1.5em;    /* 18px */
+  line-height: 1.777em /* 27px */;
+
+}
+#sidebar .blocks {
+  margin-right: -10px; /* LTR */
+}
+/* block config labels */
 .blocks div.block-region {
   margin: .25em 0;
   padding: .25em .65em;
@@ -145,8 +187,13 @@ ul.messages {
 #site-header {
   padding-top: 1.5em;
 }
+#site-header #brand-id {
+  font-size: 1em;
+  line-height: 1.5em;
+  margin: 0;
+}
 #site-branding img.logo {
-  margin-right: 10px; /* LTR */
+  vertical-align: bottom;
 }
 #site-branding span.site-name {
   font-size: 2em;      /* 24px */
@@ -154,34 +201,34 @@ ul.messages {
 }
 
 #search-box form#search-theme-form {
-  margin-top: 1.5em;
+  margin-top: .5em;
   white-space: nowrap;
   float: right; /* LTR */
 }
 #search-box label {
   visibility: hidden;
 }
-#search-box input {
-  -moz-border-radius:    15px;
-  -webkit-border-radius: 15px;
-  border-radius:         15px;
+#search-box input.form-text,
+#search-box input.form-submit {
+  -moz-border-radius:    15px; /* LTR (must be reset in RTL styles */
+  -webkit-border-radius: 15px; /* LTR (must be reset in RTL styles */
+  border-radius:         15px; /* LTR (must be reset in RTL styles */
 }
-/* LTR */
 #search-box input.form-text {
-  -moz-border-radius-topright:        5px;
-  -moz-border-radius-bottomright:     5px;
-  -webkit-border-top-right-radius:    5px;
-  -webkit-border-bottom-right-radius: 5px;
-  border-top-right-radius:            5px;
-  border-bottom-right-radius:         5px;
+  -moz-border-radius-topright:        5px; /* LTR */
+  -moz-border-radius-bottomright:     5px; /* LTR */
+  -webkit-border-top-right-radius:    5px; /* LTR */
+  -webkit-border-bottom-right-radius: 5px; /* LTR */
+  border-top-right-radius:            5px; /* LTR */
+  border-bottom-right-radius:         5px; /* LTR */
 }
 #search-box input.form-submit {
-  -moz-border-radius-topleft:        5px;
-  -moz-border-radius-bottomleft:     5px;
-  -webkit-border-top-left-radius:    5px;
-  -webkit-border-bottom-left-radius: 5px;
-  border-top-left-radius:            5px;
-  border-bottom-left-radius:         5px;
+  -moz-border-radius-topleft:        5px; /* LTR */
+  -moz-border-radius-bottomleft:     5px; /* LTR */
+  -webkit-border-top-left-radius:    5px; /* LTR */
+  -webkit-border-bottom-left-radius: 5px; /* LTR */
+  border-top-left-radius:            5px; /* LTR */
+  border-bottom-left-radius:         5px; /* LTR */
 }
 #search-box input.form-text,
 #search-box input.form-submit {
@@ -191,9 +238,7 @@ ul.messages {
 #search-box input.form-text {
   width: 180px;
 }
-#search-box input,
-#search-box input:focus {
-  outline: none;
+#search-box input {
   border: none;
 }
 
@@ -201,21 +246,24 @@ ul.messages {
 #primary-navigation {
   text-align: right; /* LTR */
 }
-
+#secondary-navigation a,
+#primary-navigation a {
+  white-space: nowrap;
+}
+#primary-navigation {
+  margin-top: .75em;
+}
 #primary-navigation li {
-  padding: 0 .25em;
+  padding: 0;
 }
 #primary-navigation li a {
-  padding: .5em 25px;
+  padding: .5em 20px 8em;
   -moz-border-radius-topleft:      6px;
   -moz-border-radius-topright:     6px;
-  -webkit-border-top-left-radius:  6px;
-  -webkit-border-top-right-radius: 6px;
-  border-top-left-radius:          6px;
-  border-top-right-radius:         6px;
-}
-#primary-navigation li a:focus {
-  outline: none;
+  -webkit-border-top-left-radius:  4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-left-radius:          4px;
+  border-top-right-radius:         4px;
 }
 
 
@@ -230,6 +278,9 @@ ul.messages {
   border-bottom-width: .25em;
   z-index: 100;
 }
+.blocks-dashboard-fx-activated #dashboard-row {
+  border-bottom-width: 0;
+}
 #dashboard {
   position: relative;
 }
@@ -243,9 +294,9 @@ ul.messages {
 /*
 ** page
 */
-#page-row {
+#page-row,
+#page {
   position: relative;
-  z-index: 50;
 }
 #page {
   padding: 3em 0;
@@ -254,11 +305,10 @@ ul.messages {
 /*
 ** content column
 */
-#content {
-  margin-top: 3em;
-}
-#content .content {
-  font-size: 1.0833em; /* 13px */
+#content .content p {
+  font-size: 1.0833em;     /* 13px */
+  line-height: 1.3846em;   /* 18px */
+  margin-bottom: 1.3846em; /* 18px */
 }
 
 /*
@@ -273,52 +323,45 @@ ul.messages {
 ** node
 */
 .taxonomy-term-description {
-  float: left;
-  padding: .25em .5em;
-  margin: -1em 0 1.5em -.5em;
-  -moz-border-radius:    5px;
-  -webkit-border-radius: 5px;
-  border-radius:         5px;
+  margin: -1em 0 1.5em;
 }
 
 .node {
   clear: both;
 }
-.node-title,
-.post-data,
-.meta .categories {
-  padding: .25em 0;
-  margin-bottom: 0;
+.node-title {
+  font-size: 1.75em;            /* 21 px */
+  padding-bottom: .14285em;     /* 3px */
+  margin-bottom: .2380em;       /* 5px */
+  border-bottom-width: .0476em; /* 1px */
   border-bottom-style: solid;
-  border-bottom-width: 1px;
-}
-
-.meta .post-data .author,
-.node-links ul.links a {
-  padding: 0 .5em;
-  -moz-border-radius:    3px;
-  -webkit-border-radius: 3px;
-  border-radius:         3px;
-}
-.node-links ul.links li {
-  padding: 0 .25em;
 }
 
 .meta {
   position: relative;
 }
-.meta .posted {
-  display: none;
+.teaser .meta .posted,
+.teaser .meta .by {
+  position: absolute;
+  z-index: -9999;
+}
+.teaser .meta .author {
+  padding-left: .5em;       /* LTR */
+  margin-left: .25em;       /* LTR */
+  border-left-width: 1px;   /* LTR */
+  border-style: solid;
 }
-
 .meta .node-type {
   position: absolute;
-  right: 0;
   top: 0;
+  z-index: -9999;
+  right: 0; /* LTR */
   line-height: 1em;
-  z-index: -1;
   font-size: 2em;
 }
+.teaser .meta .node-type {
+  z-index: 0;
+}
 
 .node ul.vocabulary li.label {
   margin: 0;
@@ -326,15 +369,29 @@ ul.messages {
 }
 
 ul.vocabulary li.term {
-  -moz-border-radius-topright:        3px;
-  -moz-border-radius-bottomright:     3px;
-  -webkit-border-top-right-radius:    3px;
-  -webkit-border-bottom-right-radius: 3px;
-  border-top-right-radius:            3px;
-  border-bottom-right-radius:         3px;
-  padding: 0 5px 0 15px;
+  padding: 0 5px 0 14px;                       /* LTR */
+  background-image: url(../images/tile-a.png); /* LTR */
+  background-repeat: no-repeat;
+  background-position: 0 -128px;               /* LTR */
+  -moz-border-radius-topright:        3px;     /* LTR */
+  -moz-border-radius-bottomright:     3px;     /* LTR */
+  -webkit-border-top-right-radius:    3px;     /* LTR */
+  -webkit-border-bottom-right-radius: 3px;     /* LTR */
+  border-top-right-radius:            3px;     /* LTR */
+  border-bottom-right-radius:         3px;     /* LTR */
 }
 
+#comment-controls .form-submit,
+#comment-controls-1 .form-submit {
+  font-size: .9em;
+  padding: 0 .5em;
+}
+#comment-controls .description,
+#comment-controls-1 .description {
+  font-size: 0.8333em;  /* 10px */
+  line-height: 1.5em;   /* 15px */
+  margin-bottom: 1.8em; /* 18px */
+}
 
 a.feed-icon {
   display: block;
@@ -345,33 +402,57 @@ a.feed-icon img {
 }
 
 
-
-#sidebar ul {
-  list-style-position: inside;
+/*
+** menu items & lists
+*/
+.block ul {
+  margin-left: 20px; /* LTR */
 }
-#sidebar ul.menu li {
-  list-style-type: none;
-  list-style-image: none;
+ul.menu,
+.block ul.links {
+  margin-left: 0px; /* LTR */
 }
-#sidebar ul.menu ul {
-  margin-left: 0; /* LTR */
+ul.menu ul {
+  margin-left: 15px; /* LTR */
 }
-#sidebar ul.menu ul li {
-  text-indent: 20px; /* LTR */
+ul.menu li,
+ul.menu li:hover {
+  list-style-image: none;
+  list-style-type: none;
 }
-#sidebar ul.menu li a {
+ul.menu li a {
   display: block;
-  padding: .42856em 0 .35713em; /* 1px */
-  font-size: 1.1667em;
-  border-top-style: solid;
-  border-top-width: 0.07142em; /* 1px */
+  padding-left: 20px; /* LTR */
+  font-size: 1.1667em;     /* 14px */
+  line-height: 1.6428em;   /* 23px */
+  margin-bottom: 0.0714em; /* 1px */
+  -moz-border-radius:    4px;
+  -webkit-border-radius: 4px;
+  border-radius:         4px;
+  white-space: nowrap;
+  overflow: hidden;
+  -moz-text-overflow:    ellipsis;
+  -o-text-overflow:      ellipsis;
+  -webkit-text-overflow: ellipsis;
+  text-overflow:         ellipsis;
+}
+ul.menu li > a {
+  background: url(../images/tile-a.png) no-repeat; /* LTR */
+}
+ul.menu li.collapsed > a {
+  background-position: 0 -66px; /* LTR */
+}
+ul.menu li.expanded > a {
+  background-position: 0 -84px; /* LTR */
 }
-#sidebar ul.menu li:first-child a {
-  border-top: none;
+ul.menu li.leaf > a {
+  background-position: 0 -102px; /* LTR */
 }
 
-/* pager */
-ul.pager,
+
+/*
+** pager
+*/
 ul.pager li {
   display:inline;
   list-style-type: none;
@@ -380,7 +461,7 @@ ul.pager li {
 }
 ul.pager a,
 ul.pager li.pager-current {
-  padding: 0 5px;
+  padding: 0 .5em;
   -moz-border-radius:    3px;
   -webkit-border-radius: 3px;
   border-radius:         3px;
@@ -395,31 +476,3 @@ ul.pager li.pager-current {
 }
 
 
-
-/* common spacing */
-.status-messages,
-.breadcrumb,
-ul.tabs,
-.help,
-.blocks,
-.block-content,
-form div.warning,
-.item-list ul.pager,
-#site-mission,
-#secondary-navigation,
-#content-header {
-  margin-bottom: 1.5em;
-}
-
-.node-content,
-.comment-content {
-  margin-top: 1.5em;
-}
-
-#sidebar {
-  margin-top: 6em;
-}
-.node,
-.comment {
-  margin-bottom: 5em;
-}
Index: Canvas/styles/jquery.fxAccordion-js-rtl.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/jquery.fxAccordion-js-rtl.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 jquery.fxAccordion-js-rtl.css
--- Canvas/styles/jquery.fxAccordion-js-rtl.css	8 Jun 2010 11:53:58 -0000	1.1.2.1
+++ Canvas/styles/jquery.fxAccordion-js-rtl.css	27 Dec 2010 07:45:36 -0000
@@ -4,10 +4,6 @@
 /*
 ** dashboard accordion
 */
-#dashboard span.fx-active {
-  margin-right: -6px;
-  padding-right: 6px;
-}
 #dashboard .dashboard-block-2 .fx-header {
   right: 130px;
 }
@@ -29,3 +25,15 @@
 #dashboard .dashboard-block-8 .fx-header {
   right: 850px;
 }
+
+/*
+** page (includes sidebar)
+*/
+#page .fx-accordion .fx-header a {
+  padding: 0 23px 0 10px;
+  background-image: url(../images/tile-a-rtl.png);
+  background-position: 100% 8px;
+}
+#page .fx-accordion h2.fx-active a {
+  background-position: 100% -28px;
+}
Index: Canvas/styles/jquery.fxAccordion-js.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/jquery.fxAccordion-js.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 jquery.fxAccordion-js.css
--- Canvas/styles/jquery.fxAccordion-js.css	8 Jun 2010 11:53:58 -0000	1.1.2.1
+++ Canvas/styles/jquery.fxAccordion-js.css	27 Dec 2010 07:45:36 -0000
@@ -5,64 +5,45 @@
   display: block;
 }
 .fx-accordion .accessibleaccordionindicator {
-  left: -99999em; /* LTR */
   position: absolute;
+  z-index: -99999;
 }
-.fx-accordion .block-content {
-  margin: 0;
-}
-.fx-accordion .c-pad {
-  padding: .5em 0 .25em;
+
+.fx-accordion .fx-header a,
+#page .fx-accordion .fx-header a {
+  white-space: nowrap;
+  overflow: hidden;
+  -moz-text-overflow:    ellipsis;
+  -o-text-overflow:      ellipsis;
+  -webkit-text-overflow: ellipsis;
+  text-overflow:         ellipsis;
 }
 
+
 /*
-** dashboard accordion
+** dashboard accordion (pseudo tabs)
 */
 #dashboard .fx-accordion {
   margin-bottom: 0;
 }
-
-#dashboard span.fx-header,
-#dashboard span.fx-header a  {
-  border-bottom-left-radius:          6px;
-  border-bottom-right-radius:         6px;
-  -moz-border-radius-bottomleft:      6px;
-  -moz-border-radius-bottomright:     6px;
-  -webkit-border-bottom-left-radius:  6px;
-  -webkit-border-bottom-right-radius: 6px;
-}
-
-#dashboard span.fx-header {
+#dashboard .fx-header {
+  font-size: 1em;
+  line-height: 1.5em;
+  margin: 0;
   position: absolute;
   top: 0em;
-  width: 100px; /* follows grid widths */
+  width: 115px;
   text-align: center;
   z-index: 9999;
 }
-#dashboard span.fx-header a {
-  width: 100px; /* follows grid widths */
-  padding-top: .25em;
-  padding-bottom: .25em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:         ellipsis;
-  -webkit-text-overflow: ellipsis;
-  -moz-text-overflow:    ellipsis;
-  -o-text-overflow:      ellipsis;
-}
-#dashboard span.fx-header a:hover,
-#dashboard span.fx-header a:focus {
-  text-decoration: underline;
-  outline: none;
-}
-#dashboard .fx-header a:hover {
-  overflow: visible;
-}
-#dashboard span.fx-active {
-  width: 106px;
-  margin-left: -6px; /* LTR */
-  padding-left: 6px; /* LTR */
-  padding-bottom: .5em;
+#dashboard .fx-header a {
+  padding: 0 5px 2px;
+  -moz-border-radius-bottomleft:      4px;
+  -moz-border-radius-bottomright:     4px;
+  -webkit-border-bottom-left-radius:  4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-left-radius:          4px;
+  border-bottom-right-radius:         4px;
 }
 #dashboard .dashboard-block-2 .fx-header {
   left: 130px; /* LTR */
@@ -88,24 +69,39 @@
 #dashboard .fx-accordion .block-content {
   margin: 0;
 }
-#dashboard .fx-accordion .block-content .c-pad {
-  padding: 3em 0 1em;
+
+#dashboard .fx-accordion .accessibleaccordionindicator {
+  top: -9999em;
+}
+#dashboard .fx-accordion .c-pad {
+  padding-top: 2em;
 }
 
 /*
-** sidebar
+** page (includes sidebar)
 */
 #page .fx-accordion {
+  padding: 1px;
   -moz-border-radius:    6px;
   -webkit-border-radius: 6px;
   border-radius:         6px;
 }
-#page .fx-accordion .fx-header {
-  font-size: 1.5em; /* 18px */
-  line-height: 1.3333em; /* 24px */
-  margin: 0;
-  padding: .16666em 0;
-  border-bottom-style: solid;
-  border-bottom-width: 1px;
+#page .fx-accordion .block {
+  padding: 0;
+  margin: 1px;
+}
+#page .fx-accordion .fx-header a {
+  padding: 0 10px 0 23px;                      /* LTR */
+  background-image: url(../images/tile-a.png); /* LTR */
+  background-repeat: no-repeat;
+  background-position: 0 8px;                  /* LTR */
+  -moz-border-radius:    4px;
+  -webkit-border-radius: 4px;
+  border-radius:         4px;
+}
+#page .fx-accordion h2.fx-active a {
+  background-position: 0 -28px; /* LTR */
+}
+#page .fx-accordion .fx-content {
+  margin: .25em 10px;
 }
-
Index: Canvas/styles/jquery.fxTabs-js.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/jquery.fxTabs-js.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 jquery.fxTabs-js.css
--- Canvas/styles/jquery.fxTabs-js.css	8 Jun 2010 11:53:58 -0000	1.1.2.1
+++ Canvas/styles/jquery.fxTabs-js.css	27 Dec 2010 07:45:36 -0000
@@ -1,39 +1,37 @@
-/* $Id: jquery.fxTabs-js.css,v 1.1.2.1 2010/06/08 11:53:58 dvessel Exp $ */
+/* $Id: jquery.fxTabs-js.css,v 1.1.2.1 2010/05/14 23:47:44 dvessel Exp $ */
 
+.fx-tabs {
+  -moz-border-radius:    6px;
+  -webkit-border-radius: 6px;
+  border-radius:         6px;
+}
 .fx-tabs ul.fx-titles {
-  list-style: none;
-  padding: 0;
-  margin: 0 .25em;
+  margin: 0 1px;
 }
 .fx-tabs .fx-titles li {
   display: inline;
-  margin: 0 .25em;
+  line-height: 2em;
 }
 .fx-tabs .fx-titles a {
-  text-decoration: none;
   white-space: nowrap;
   padding: .25em .5em;
-
   -moz-border-radius:    3px;
   -webkit-border-radius: 3px;
   border-radius:         3px;
 }
-.fx-tabs .fx-titles .page-active a {
-  color: #f57915;
-}
 .fx-tabs .fx-current-info,
 .fx-tabs .accessibletabsheader {
-  left: -99999em; /* LTR */
   position: absolute;
+  z-index: -9999;
 }
 
-.fx-tabs .block {
-  -moz-border-radius:    6px;
-  -webkit-border-radius: 6px;
-  border-radius:         6px;
-  padding: 1.5em;
+#page .fx-tabs {
+  padding: 1px;
 }
-
-.fx-tabs .block-content {
-  margin: 0;
+#page .fx-tabs .block {
+  padding: 1px 0;
+  margin-bottom: 0;
+}
+#page .fx-tabs .block-content {
+  margin: 0 10px;
 }
Index: Canvas/templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/templates/Attic/node.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 node.tpl.php
--- Canvas/templates/node.tpl.php	8 Jun 2010 11:53:58 -0000	1.1.2.2
+++ Canvas/templates/node.tpl.php	27 Dec 2010 07:45:36 -0000
@@ -4,6 +4,10 @@
   <h2 class="node-title title">
     <a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a>
   </h2>
+  <?php else: ?>
+  <div class="node-content content">
+    <?php print $content ?>
+  </div>
   <?php endif ?>
 
   <?php if ($submitted): ?>
@@ -25,9 +29,11 @@
   </div>
   <?php endif ?>
 
+  <?php if (!$page): ?>
   <div class="node-content content">
     <?php print $content ?>
   </div>
+  <?php endif ?>
 
   <div class="node-links">
     <?php print $links ?>
Index: Canvas/templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/templates/Attic/page.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 page.tpl.php
--- Canvas/templates/page.tpl.php	8 Jun 2010 11:53:58 -0000	1.1.2.2
+++ Canvas/templates/page.tpl.php	27 Dec 2010 07:45:36 -0000
@@ -14,12 +14,14 @@
     <div id="site-header" class="container-16 clearfix">
 
         <?php if ($logo_img || $site_name || $site_slogan): ?>
-        <div id="site-branding" class="grid-6">
+        <div id="site-branding" class="grid-5">
           <?php if ($logo_img || $site_name): ?>
-          <a href="<?php print $front_page ?>" title="<?php print t('Home') ?>" rel="home">
-            <?php print $logo_img // img.logo ?>
-            <?php if ($site_name): ?><span class="site-name"><?php print $site_name ?></span><?php endif ?>
-          </a>
+          <h2 id="brand-id">
+            <a href="<?php print $front_page ?>" title="<?php print t('Home') ?>" rel="home">
+              <?php print $logo_img // img.logo ?>
+              <?php if ($site_name): ?><span class="site-name"><?php print $site_name ?></span><?php endif ?>
+            </a>
+          </h2>
           <?php endif ?>
 
           <?php if ($site_slogan): ?>
@@ -32,14 +34,14 @@
 
 
         <?php if ($secondary_links): ?>
-        <div id="secondary-navigation" class="grid-10">
+        <div id="secondary-navigation" class="grid-11">
           <?php print theme('links', $secondary_links, array('class' => 'navigation secondary links'))
             // ul.navigation.secondary.links > li.menu-ID[.first|.last] > a[.active] ?>
         </div>
         <?php endif ?>
 
         <?php if ($search_box): ?>
-        <div id="search-box" class="grid-10">
+        <div id="search-box" class="grid-11">
           <?php print $search_box
             // form#search-theme-form > div > ... ?>
         </div>
@@ -60,7 +62,6 @@
     <?php if ($dashboard): ?>
     <div id="dashboard" class="container-16 clearfix">
       <?php print $dashboard
-        // Must add it's own grid classes.
         // div#blocks-dashboard > div#block-ID.block.block-MODULE ?>
     </div>
     <?php endif ?>
@@ -92,7 +93,7 @@
 
         <?php if ($title || $tabs || $help): ?>
         <div id='content-header'>
-
+<?php print $breadcrumb; ?>
           <?php if ($title): ?>
           <h1 class="page-title title">
             <?php print $title ?>