Index: Canvas/hex_canvas.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/Attic/hex_canvas.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 hex_canvas.info --- Canvas/hex_canvas.info 21 May 2010 18:26:53 -0000 1.1.2.1 +++ Canvas/hex_canvas.info 8 Jun 2010 11:41:33 -0000 @@ -11,9 +11,10 @@ screenshot = images/screenshot.png ; This setting is not inherited. plugins[] = smarter_styles plugins[] = ninesixty +plugins[] = region_groups plugins[] = fxAccordion plugins[] = fxTabs - +;plugins[] = theme_wrapper ; BASE STYLES (smarter_css plugin settings.) ; Any theme styles will be included in the head of the page before all others @@ -24,9 +25,11 @@ stylesheets base[all][] = defaults.css stylesheets base[all][] = hex-typography.css stylesheets base[all][] = hex-elements.css stylesheets base[all][] = 960-16-col.css +; stylesheets base[all][] = 960-debug.css ; STYLES stylesheets[all][] = canvas.css +stylesheets[all][] = canvas-base-color.css stylesheets[all][] = canvas-color.css @@ -50,3 +53,13 @@ regionfx[fxAccordion][] = content_a regionfx[fxAccordion][] = dashboard 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[sidebar][] = sidebar +region groups[sidebar][] = sidebar_accordion +region groups[sidebar][] = sidebar_tabs +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.1 diff -u -p -r1.1.2.1 logo.png Binary files /tmp/cvsvoRQbi and logo.png differ Index: Canvas/images/tag_left.png =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/images/Attic/tag_left.png,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 tag_left.png Binary files /tmp/cvsoa2BF0 and tag_left.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.1 diff -u -p -r1.1.2.1 canvas-ie.css --- Canvas/styles/canvas-ie.css 21 May 2010 18:26:54 -0000 1.1.2.1 +++ Canvas/styles/canvas-ie.css 8 Jun 2010 11:41:33 -0000 @@ -1,24 +1 @@ -#dashboard .container-16 {position:relative; bottom:0;} - - -#dashboard h2 { padding:10px 6px; margin:0;} -#dashboard h2.title a {padding:3px;} -#dashboard .fx-accordion .fx-header a {margin-bottom:-0.5em;} - -#site-branding {padding-bottom:0;} -#site-navigation {float:right; height:49px;} - -.terms ul.links {margin-top:-20px;} - -.page .node-links ul.links li {float:left;} -.page .node-links {overflow:auto;} -#content ul.primary li a {float:left;} - - -#search .form-text-wrapper, #search .search-submit{float:left;} -#search input.form-text {padding:0;} -#search input#edit-search-theme-form-1 {padding:0; margin:1px 0;} - - -.view-author-info .views-field-uid, .view-author-info .views-field-uid-1, .view-author-info .views-field-uid-2, -.book-navigation ul.menu li{zoom:1;} \ No newline at end of file +/* $Id: hex-style-ie.css,v 1.1.2.1 2010/05/14 23:47:44 dvessel Exp $ */ Index: Canvas/styles/canvas.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/Attic/canvas.css,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 canvas.css --- Canvas/styles/canvas.css 21 May 2010 18:26:54 -0000 1.1.2.1 +++ Canvas/styles/canvas.css 8 Jun 2010 11:41:33 -0000 @@ -1,704 +1,425 @@ -/** - * Start adding styles here or copy any style sheet - * from core, modules or the base theme and make your edits. - */ - -/* font styling & page elements */ - -html>body { - font-family:"Lucida Grande", Lucida, Verdana, sans-serif; - font-size:13px; - } - +/* $Id: hex-style.css,v 1.1.2.1 2010/05/14 23:47:44 dvessel Exp $ */ + + +/* Common spacing set at the bottom of this file. */ + body { - font-family:"Lucida Grande", Lucida, Verdana, sans-serif; - font-size:13px; - } - -a, a:visited { - padding:3px; - text-decoration:none; - } - -h1.page-title, h2.title { - clear:both; - } - -h2.title a{ - padding:0; - } - -h2 { - font-size:1.55em; - } - -h3 { - font-size:1.2em; - line-height:1em; - margin:0.5em 0; - } - - -/* Header */ - -#site-branding { - padding:10px 20px 0; - } - -#logo { - float:left; - padding-right:15px; - } - -#logo img { - margin-right:15px; - } - -.site-name { - font-size:240%; - letter-spacing:3px; - text-transform:uppercase; - } - -.site-name a:hover, #logo a:hover { - background-color:transparent; - } - -/* Search */ - -#search { - clear:right; - float:right; - } - -#search .form-text-wrapper{ - padding:5px 20px 5px 10px; - -moz-border-radius: 15px; - -webkit-border-radius:15px; - } - -#search input#edit-search-theme-form-1 { - border:none; - background:transparent; - } - -#search input.form-submit { - border:none; - padding:0; - background:transparent none; - } - -.search-submit { - padding:5px; - margin-left:-25px; - -moz-border-radius: 15px; - -webkit-border-radius:15px; -} - -#site-navigation { - clear:both; - padding:20px 20px 0; - height:33px;} - -/* Secondary links nav */ - -#secondary-links { - float:right; - font-size:90%; - margin-bottom:1em; - } - -/* Primary links nav */ - -ul.navigation li { - list-style-image:none; - list-style-type:none; - display:inline; - padding: 0; - } - -ul.navigation li a { - padding:15px 25px 15px; - text-decoration:none; - -moz-border-radius-topleft: 10px; - -moz-border-radius-topright: 10px; - -webkit-border-top-left-radius: 10px; - -webkit-border-top-right-radius: 10px; - } - -ul.navigation li.active-trail a { - font-weight:bold; - padding:15px 25px 20px; - } + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif; + min-width: 980px; /* prevent bg clipping with narrow viewports. */ +} -/* Dashboard */ -#dashboard { - border-top: 4px solid; - margin-bottom:1.5em; - } - -#dashboard .menu { - padding:30px 0 35px; - margin:0 auto; - width:960px; - } - -#dashboard h2.fx-header { - font-size:100%; - background: none; - padding:0.25em 0.25em 0.5em; - border:0 none; - text-align:center; - width:130px; - margin-left:110px; - text-transform:uppercase; - -moz-border-radius-bottomleft: 9px; - -moz-border-radius-bottomright: 9px; - -webkit-border-bottom-left-radius: 9px; - -webkit-border-bottom-right-radius: 9px; - } - -#dashboard h2.fx-header a{ - border:none; - } - -#dashboard h2.fx-header a:hover{ - background:transparent; - } - -#dashboard li { - display:inline; - margin-right: 30px; - } - -#dashboard li.leaf { - list-style-image:none; - list-style-type:none; - border:none; - } - -#dashboard li a { - padding: 5px 40px 5px 20px; - background: transparent url(../images//link.png) no-repeat 92% center; - background: url(../images//link.png) no-repeat 92% center; - display:inline; - font-weight:bold; - -moz-border-radius:20px; - -webkit-border-radius:20px; - } - -/* Page inner */ - -#page-inner { - padding:2em 0 4em; - } +/* +** 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; +} + -/* Sidebar */ +/* +** links +*/ +a { + text-decoration: none; +} +#page-row a:hover, +#page-row a:focus, +#page-row a:active { + text-decoration: underline; +} + +/* +** form elements +*/ +input[type=button], +input[type=submit] { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: none; + padding: .25em 10px; + margin-left: .25em; + margin-right: .25em; + cursor: pointer; +} + + +/* +** applies to site links and tabs (local tasks). +*/ +ul.primary, +ul.secondary { + margin: 0; +} +.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 { + text-decoration: underline; +} + +/* +** Status messages. These also apply in forms. +*/ +#status-message ul.messages { + float: right; + margin-bottom: 1.5em; +} +ul.messages { + padding: .25em 1em; + margin: 0; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +.messages li { + margin: 0; + list-style-type: none; + text-overflow: ellipsis; + overflow: hidden; +} +.messages li:hover { + overflow: visible; +} + +/* +** blocks +*/ +#page .blocks { + margin-bottom: 3em; +} #sidebar .blocks { - margin: 0 0 3em; - } + margin-right: -1em; +} +#page .block { + padding-left: 1em; + padding-right: 1em; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; +} +.blocks div.block-region { + margin: .25em 0; + padding: .25em .65em; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + font-size: 1.25em; + border-style: dashed; + border-width: 1px; +} + + +/* +** site header +*/ +#site-header-row { + border-bottom-style: solid; + border-bottom-width: .25em; +} +#site-header { + padding-top: 1.5em; +} +#site-branding img.logo { + margin-right: 10px; /* LTR */ +} +#site-branding span.site-name { + font-size: 2em; /* 24px */ + line-height: 1.25em; /* 30px */ +} + +#search-box form#search-theme-form { + margin-top: 1.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; +} +/* 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; +} +#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; +} +#search-box input.form-text, +#search-box input.form-submit { + padding: .25em 10px; + margin: 0; +} +#search-box input.form-text { + width: 180px; +} +#search-box input, +#search-box input:focus { + outline: none; + border: none; +} + +#secondary-navigation, +#primary-navigation { + text-align: right; /* LTR */ +} + +#primary-navigation li { + padding: 0 .25em; +} +#primary-navigation li a { + padding: .5em 25px; + -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; +} + + +/* +** dashboard +** more rules for dashboard accordions in jquery.fxAccordion-js.css. +*/ +#dashboard-row { + position: relative; + border-style: solid; + border-top-width: .25em; + border-bottom-width: .25em; + z-index: 100; +} +#dashboard { + position: relative; +} +#blocks-dashboard .block-region { + margin-top: 2em; +} +.blocks-dashboard-fx-activated #blocks-dashboard .block-region { + margin-top: 0; +} + +/* +** page +*/ +#page-row { + position: relative; + z-index: 50; +} +#page { + padding: 3em 0; +} + +/* +** content column +*/ +#content { + margin-top: 3em; +} +#content .content { + font-size: 1.0833em; /* 13px */ +} -/* Accordion */ +/* +** content header +*/ +.breadcrumb { + word-spacing: .3em; + margin-top: -1.5em; +} -h2.fx-header { - background-image:url(../images//accordion.png); - background-position:0 center; - background-repeat:repeat-x; - border-bottom:1px solid; - font-size:100%; - margin:0 0 1px; - } - -.fx-active h2.fx-header { - background-image:url(../images//accordion.png); - background-position:0 center; - background-repeat:repeat-x; - } - -#page-inner .fx-accordion h2.fx-header a { - border-bottom:none; - /*font-size:65%;*/ - font-weight:bold; - text-transform:uppercase; - background: transparent url(../images//collapsed.png) no-repeat scroll 98% center; - padding: 1em; - } - -#page-inner .fx-accordion .fx-active h2 a { - background: transparent url(../images//expanded.png) no-repeat scroll 98% center; - } - -#page-inner .fx-accordion .fx-content { - padding:15px; - border:1px solid; - } - -/* Tabs */ - -#main .fx-tabs ul.fx-titles { - border-bottom:none; -} - -.fx-tabs .fx-titles li a { - font-size:85%; - font-weight:bold; - text-transform:uppercase; - } - -.fx-tabs .fx-titles li { - padding:10px; - margin:0; - } - -.fx-tabs .fx-titles li.fx-active { - border-top:1px solid; - border-right:1px solid; - border-left:1px solid; - padding-bottom:11px; - } - -#main .fx-tabs .fx-contents { - padding:15px; - border:1px solid; - margin-top:7px; - } - -#main .fx-tabs .fx-titles .fx-active a { - border:none; - } +/* +** 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; +} -/* Node/views teaser */ +.node { + clear: both; +} +.node-title, +.post-data, +.meta .categories { + padding: .25em 0; + margin-bottom: 0; + 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 { - float:right; - text-align:center; - margin-top:-15px; - } - -.page .meta { - margin-bottom:1em; - } - -.node-type, .date { - float:left; - padding:7px 20px; - } - -.node-type { - margin-right:5px; - text-transform: uppercase; - } - -.views-row .teaser, .node { - margin-top:1.5em; - padding: 0 25px 25px; - border:1px solid; - } - -.views-row .teaser p, .node.teaser p { - margin:0 0 .5em; - } - -.views-row .teaser h2, .node.teaser h2 { - margin: 1em 0 0; - clear:both; - } - -.tags { - clear:both; - border-bottom:1px solid; - padding:0.5em 0; - overflow:auto; - font-size:80%; - margin-bottom:1em; -} - -.node ul { - margin-left: 1.5em; -} - -.author{ - clear:both; - padding:0.5em; - font-size:85%; - text-align:right; - border-bottom:1px solid; - border-top:1px solid; - } - -h3.label { - font-size:1em; - margin-bottom:0.5em; - } - -/* Taxonomy terms */ - -.terms { - float:left; - margin-top:10px; - text-transform:lowercase; - } - -.vocabulary { - margin-bottom:0.5em; - overflow:auto; - } - -span.vocabulary-name { - padding:0.25em; - font-weight:bold; - } - -.terms ul.links { - float:right; - padding:0; - width:450px; - } - -.terms ul.links li { - padding:0.25em; - float:left; - display:block; - margin-bottom:0.25em; - } - -.terms a { - background: url(../images//tag_left.png) no-repeat -1px center; - -moz-border-radius-topRight:3px; - -moz-border-radius-bottomRight: 3px; - -webkit-border-top-right-radius:3px; - -webkit-border-bottom-right-radius: 3px; - padding:3px 5px 3px 15px; - } - -/* Node */ - -.node-content { - clear:both; - padding-top:1em; - } - -.page .node-links { - font-size:95%; - margin-top:2em; - padding:0.5em; - text-align:right; - } - -/* Media grid */ - -/* fieldset {padding:0.5em;}*/ - - -/* Node edit */ - -.node-form .form-text { - border:2px solid; - padding:5px; - } - -.node-form .admin { - margin-bottom:1.5em; - } - -/* Messages */ - -.status-messages { - border:2px solid; - padding: 10px; - margin:10px 20px 20px; - } - -.status-messages ul { - margin-bottom:0; - margin-left:0.5em; - } - -/* Teaser links */ - -.links { - clear:both; - padding:0 0 16px; - text-align:right; - } - -li.node_read_more a{ - background: url(../images//more.png) no-repeat 98% center scroll; - padding:7px 22px 7px 7px; - } - -/* Content tabs */ - -#content ul.primary { - list-style-image:none; - list-style-position:outside; - list-style-type:none; - margin:0 0 40px; - padding:15px; - overflow:auto; - font-size:90%; - } - -#content ul.primary li { - float:left; - margin:0 10px 0 0; - } - -#content ul.primary li a { - padding:5px; - border:1px solid; - } - -#content .blocks { - margin-bottom:15px; - } - -/* Menus */ - -.menu { - margin-bottom:2em; - } - -.menu h2 { - line-height:1.3em; - margin:0 0 0.5em; - } - -.menu ul { - margin:0; - } - -.menu li a { - display:block; - padding:10px 30px 10px 10px; - } - -.menu li a:hover, .menu li a.active { - list-style-image:none; - list-style-type:none;} - -.menu li a.active{ - background: transparent url(../images//collapsed.png) no-repeat scroll 98% center; - } - -.menu ul li { - border-bottom: 1px solid; - list-style-image:none; - list-style-type:none; - } - -.menu li.leaf, .menu li.collapsed { - border-bottom:1px solid; - list-style-image:none; - list-style-type:none; - } - -.menu li.expanded { - list-style-image:none; - list-style-type:none; - } - -.menu li.expanded a{ - font-weight:bold; - } - -.menu li.expanded ul.menu li a { - font-weight:normal; - padding-left:1.5em; - } - -.menu li.collapsed.last { - border-bottom:none; - } - -.menu li.expanded ul.menu li.expanded a{ - font-weight:bold; - } - -.menu li.expanded ul.menu li.expanded ul.menu { - padding-left:1.5em; - font-size:90%; - } - -.menu li.expanded ul.menu li.expanded ul.menu a { - font-weight:normal; - } - -.menu li.expanded ul.menu li.expanded ul.menu li { - border-bottom:none; - } - -/* Pager */ - -ul.pager { - list-style-type:none; - } - + position: relative; +} +.meta .posted { + display: none; +} + +.meta .node-type { + position: absolute; + right: 0; + top: 0; + line-height: 1em; + z-index: -1; + font-size: 2em; +} + +.node ul.vocabulary li.label { + margin: 0; + padding: 0; +} + +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; +} + + +a.feed-icon { + display: block; + min-height: 1.5em; +} +a.feed-icon img { + display: block; +} + + + +#sidebar ul { + list-style-position: inside; +} +#sidebar ul.menu li { + list-style-type: none; + list-style-image: none; +} +#sidebar ul.menu ul { + margin-left: 0; /* LTR */ +} +#sidebar ul.menu ul li { + text-indent: 20px; /* LTR */ +} +#sidebar 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 */ +} +#sidebar ul.menu li:first-child a { + border-top: none; +} + +/* pager */ +ul.pager, ul.pager li { - display:inline; - margin-right:5px; - padding:2px 4px; - } - -ul.pager li a:hover { - background-color:transparent; - text-decoration:underline; - } - -/* Autocomplete throbber position override */ - -html.js #main input.form-autocomplete { - background-position:100% 6px; - } - -html.js #main input.throbbing { - background-position: 100% -15px; /* LTR */ - } - - -/* Core book module */ - -.book-navigation ul.menu { - border:1px solid; - list-style-position:inside; - margin:0.5em 0.5em 2em; - padding:0.5em; - } - -.book-navigation ul.menu li { - list-style-image: url(../images//bullet.png); - padding-bottom:1em; - border-bottom:none; - } - -.book-navigation ul.menu li a{ - display:inline; - } - -.book-navigation .page-links a { - font-weight:bold; - text-transform:uppercase; - font-size:85%; - float:left; - width:190px; - } - -.book-navigation .menu li a:hover { - background-image:none; - } - -.book-navigation a.page-next { - background-image: url(../images//dbl_arrow_right.png); - background-repeat:no-repeat; - background-position: right 8px; - padding:0.5em 2.25em 0.5em 0.25em; - float:right; - text-align:left; - } - -.book-navigation a.page-up { - margin:0.75em 2.25em; - padding:0.5em; - text-align:center; - width:30px; - } - -.book-navigation a.page-previous { - background-image: url(../images//dbl_arrow_left.png); - background-repeat:no-repeat; - background-position: left 8px; - padding:0.5em 0.25em 0.5em 2.25em; - text-align:right; - } - -/* Item list */ - -.item-list ul { - list-style-image: url(../images//bullet.png); - margin-left:0.75em; - } - -.item-list ul li { - padding-bottom:.25em; - } - -/* Comments */ - -#comments h2.title{ - font-weight:normal; - padding-left:20px; - } - -.comment { - border:1px solid; - padding:20px; - margin:20px; - } - -.comment .user-picture { - float:left; - } - -.comment .user-picture img { - border: 6px solid; - } - -.comment .meta { - float:none; - text-align:left; - margin-top:0; - } - -.comment-content { - clear:both; - } + display:inline; + list-style-type: none; + margin: 0; + padding: 0; +} +ul.pager a, +ul.pager li.pager-current { + padding: 0 5px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + + +/* +** footer +*/ +#footer-row { + padding: 1.5em 0; +} -/* Default table view w/ terms */ -tbody .views-field-tid { - font-size:90%; - text-transform:lowercase; - } - -tr { - border-bottom:1px solid; - } - -td, th { - padding:1.25em 0.5em; - } - -table a, table a:visited { - padding:0; - } - -tbody .views-field-title { - font-weight:bold; - } - -/* Forms input */ - -input.form-text, select.form-select { - border:1px solid; - margin:0.25em 0; - padding:5px 10px; - } - -select.form-select { - padding:5px 3px 5px 10px; - font-size:100%; - } - -input.form-submit { - background:url(../images//accordion.png) repeat-x 0 center; - border:1px solid; - padding:4px; - } - -/* footer */ - -#footer { - padding:1em 0; - } + +/* 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/colors/canvas-color.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/hexagon/Canvas/styles/colors/Attic/canvas-color.css,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 canvas-color.css --- Canvas/styles/colors/canvas-color.css 21 May 2010 18:26:54 -0000 1.1.2.1 +++ Canvas/styles/colors/canvas-color.css 8 Jun 2010 11:41:33 -0000 @@ -1,317 +1,261 @@ -/** - * #575753 - * Dark brown -**/ +/* $Id: hex-colors.css,v 1.1.2.1 2010/05/14 23:47:44 dvessel Exp $ */ -/* Default text */ -body {color:#575753;} - -/* Accordion header text */ -#page-inner .fx-accordion .fx-header a {color:#575753;} - -/* Tabs text */ -.fx-tabs .fx-titles li a {color:#575753;} - -/* Table taxonomy term active state text */ -tbody .views-field-tid a.active{color:#575753;} - -/** - * #2E2D2C - * Darker brown -**/ - -/* Page and block title text */ -h1.page-title, h2.title {color:#2E2D2C;} - -/* Site header background */ -#site-header {background-color:#2E2D2C;} - -/* Primary navigation active tab text */ -ul.navigation li.active-trail a {color:#2E2D2C;} - -/* Tags hover background */ -.terms a:hover {background-color:#2E2D2C;} - -/* Dashboard menu hover background */ -#dashboard li a:hover {background-color:#2E2D2C;} - -/* Comments title background */ -#comments h2.title{background-color:#2E2D2C;} - -/* Form submit hover background */ -.search-submit:hover {background-color:#2E2D2C;} - -/* Accordion hover background */ -#page-inner .fx-accordion h2.fx-header:hover {background-color:#2E2D2C;} - -/** - * #3BCC42 - * Green - Main accent color -**/ - -/* Default link text */ -a, a:visited {color:#3BCC42;} - -/* Primary nav tab hover background */ -ul.navigation li a:hover{background-color: #3BCC42;} - -/* Primary nav active tab hover text */ -ul.navigation li.active-trail a:hover {color: #3BCC42;} - -/* Search text color */ -#search input#edit-search-theme-form-1 {color:#3BCC42;} - -/* Search submit background */ -.search-submit {background-color:#3BCC42;} - -/* Taxonomy term tag background */ -.terms a {background-color: #3BCC42;} - -/* Read more hover background */ -li.node_read_more a:hover {background-color:#3BCC42;} - -/* Content local active tab background */ -#content ul.primary li a.active {background-color:#3BCC42;} - -/* Navigation hover and active text */ -.menu li a:hover, .menu li a.active {color:#3BCC42;} - -/* Dashboard color*/ -#dashboard {border-color: #3BCC42;} -#dashboard .fx-content {background-color:#3BCC42;} -#dashboard h2.fx-header {background-color:#3BCC42;} - -/* Pager background*/ -ul.pager li {background-color:#3BCC42;} - -/* Book next & previous link hover text */ -.book-navigation .page-links a:hover {color:#3BCC42;} - -/* Form submit background */ -input.form-submit {background-color:#3BCC42;} - -/** - * #E3E1DE - * Light beige -**/ - -/* Link hover background */ -a:hover{background-color:#E3E1DE;} - -/* Footer background */ -#footer {background-color:#E3E1DE;} - -/* Accordion background and border*/ -h2.fx-header {background-color:#E3E1DE;} -h2.fx-header {border-color:#E3E1DE;} - -/* Accordion content border */ -#main .fx-accordion .fx-content {border-color: #E3E1DE;} - -/* Inactive tab background */ -.fx-tabs .fx-titles li {background-color:#E3E1DE;} - -/* Active tab border */ -.fx-tabs .fx-titles li.fx-active {border-color:#E3E1DE;} - -/* Tab content border */ -#main .fx-tabs .fx-contents {border-color:#E3E1DE;} - -/* Node date background */ -.date {background-color:#E3E1DE;} - -/* Node border */ -.views-row .teaser, .node {border-color:#E3E1DE;} - -/* Book border */ -.book-navigation {border-color:#E3E1DE;} - -/* Tags and author area border */ -.tags {border-color:#E3E1DE;} -.author{border-color:#E3E1DE;} - -/* File field upload border */ -.field-field-file-upload {border-color:#E3E1DE;} - -/* Form element borders */ -fieldset {border-color:#E3E1DE;} -.node-form .form-text {border-color:#E3E1DE;} -input.form-text, select.form-select {border-color:#E3E1DE;} -input.form-submit {border-color:#E3E1DE;} - -/* Local conten tab border */ -#content ul.primary li a {border-color:#E3E1DE;} - -/* Nav border */ -.menu li.leaf, .menu li.collapsed {border-color: #E3E1DE;} - -/* Nav text*/ -.menu li.expanded a{background-color:#E3E1DE;} - -/* Pager background */ -ul.pager li.pager-current {background-color:#E3E1DE;} - -/* Page book menu border */ -.book-navigation ul.menu {border-color:#E3E1DE;} - -/* Image border */ -.views-field-picture img{border-color:#E3E1DE;} - -/* Comments background */ -#comments {background-color:#E3E1DE;} - -/* Comment and user image border*/ -.comment {border-color:#E3E1DE;} -.comment .user-picture img {border-color: #E3E1DE;} - -/* Table border */ -tr {border-color:#E3E1DE;} -table#field-file-upload-values tr {border-color:#E3E1DE;} - -/** - * #F5F5F5 - * Soft white -**/ - -/* Site name text */ -.site-name {color:#F5F5F5;} - -/* Search background */ -#search .form-text-wrapper {background-color: #F5F5F5;} - -/* Search submit text */ -#search input.form-submit {color:#F5F5F5;} - -/* Primary nav text */ -ul.navigation li a{color:#F5F5F5;} - -/* Primary nav active tab background */ -ul.navigation li.active-trail a {background-color:#F5F5F5;} - -/* Accordion text */ -#page-inner .fx-accordion h2.fx-header:hover {color:#F5F5F5;} -#page-inner .fx-accordion h2.fx-header a:hover {color:#F5F5F5;} - -/* Node type text */ -.node-type {color:#F5F5F5;} - -/* Node author background */ -.author{background-color:#F5F5F5;} - -/* Tag link text */ -.terms a {color:#F5F5F5;} - -/* Node links background */ -.page .node-links {background-color:#F5F5F5;} - -/* Read more background */ -li.node_read_more a{background-color: #F5F5F5;} - -/* Read more hover text */ -li.node_read_more a:hover {color:#F5F5F5;} - -/* Dashboard tab text */ -#dashboard h2.fx-header a{color:#F5F5F5;} - -/* Dashboard menu link text */ -#dashboard li a {color:#F5F5F5;} - -/* Pager text */ -ul.pager li a{color:#F5F5F5;} - -/* Comments title text */ -#comments h2.title{color:#F5F5F5;} - -/* Submit button text */ -input.form-submit {color:#F5F5F5;} - -/* Primary nav hover text */ -ul.navigation li a:hover{color: #F5F5F5;} - - -/** - * #C2C1BF - * Dark beige -**/ - -/* Search submit hover background */ -.search-submit:hover {background-color:#C2C1BF;} - -/* Node type background */ -.node-type {background-color:#C2C1BF;} - -/** - * #FFFFFF - * White -**/ - -/* Accordion text */ -#page-inner .fx-accordion .fx-active h2 a {color:#FFFFFF;} -#page-inner .fx-accordion .fx-active h2 a:hover {color:#FFFFFF;} - -/* Accordion content background */ -#page-inner .fx-accordion .fx-content {background-color:#FFFFFF;} - -/* Active tab background*/ -.fx-tabs .fx-titles li.fx-active {background-color:#FFFFFF;} - -/* Tab content background */ -#main .fx-tabs .fx-content {background-color:#FFFFFF;} - -/* Node background */ -.views-row .teaser, .node {background-color:#FFFFFF;} -#content ul.primary {background-color:#FFFFFF;} - -/* Local nav active text */ -#content ul.primary li a.active {color:#FFFFFF;} - -/* Main navigation expanded*/ -.menu li.expanded {background-color:#FFFFFF;} -.menu li.expanded ul.menu li a{background-color:#FFFFFF;} - -/* Comment background */ -.comment {background-color:#FFFFFF;} - -/** - * #858482 - * Med brown gray -**/ - -/* Active accordion background */ -.fx-active h2.fx-header {background-color:#858482;} - -/* Book nav page up text */ -.book-navigation a.page-up {color:#858482;} - -/* Form text */ -input.form-text, select.form-select {color:#858482} - -/* Tags label text */ -.tags {color:#858482;} - -/* Author text */ -.author{color:#858482;} - -/* Node links text */ -.page .node-links a {color:#858482;} - -/* Main navigation text */ -.menu li a {color:#858482;} - -/* Tags text color in table */ -tbody .views-field-tid {color:#858482;} - -/** - * Misc -**/ - -/* Primary nav tab background */ -ul.navigation li a {background-color: #1B1B1A;} - -/* Dashboard menu links background -- transparent to take on background color*/ -#dashboard li a {background-color: rgba(244, 244, 244, 0.3);} - -/* Status Messages */ -.status-messages {background-color:#FFFFCC;} -.status-messages {border-color:#FFFF77;} +/* +** links +*/ +a:link { + color: #3c985b; +} +a:visited { + color: #b28500; +} +a:hover, +a:focus, +a:active { + color: #b28500; +} + +#page a, +#page .title { + text-shadow: rgba(0,0,0,0.05) 0 .1em .1em; +} + +@-webkit-keyframes Pulse { + from { + color: #fff; + background-color: #749a02; + } + 20% { + color: #fff; + background-color: #91bd09; + } + to { + color: #ddd; + background-color: #749a02; + } +} + +/* +** form elements +*/ +input[type=button], +input[type=submit] { + color: #333; + background-image: -moz-linear-gradient( + rgba(255,255,255,.25) 0%, rgba(0,0,0,.25) 95%); + background-image: -webkit-gradient(linear, 0% 0%, 0% 95%, + from(rgba(255,255,255,.25)), to(rgba(0,0,0,.25))); + background-color: #f6f6f0; + background-color: rgba(227,225,222,0.5); + + -moz-box-shadow: 0 .1em .2em rgba(0,0,0,.75); + -webkit-box-shadow: 0 .1em .2em rgba(0,0,0,.75); + box-shadow: 0 .1em .2em rgba(0,0,0,.75); +} +/* Animation completely throws off cascade specificity */ +/*input[id^=edit-submit] { + background-color: #47b26a; + color: #fffeff; + -webkit-animation-name: Pulse; + -webkit-animation-duration: 2s; + -webkit-animation-iteration-count: infinite; +}*/ + +input[type=button]:hover, +input[type=button]:focus, +input[type=submit]:hover, +input[type=submit]:focus { + outline: none; + color: #333; + background-color: #eee; + background-color: rgba(240, 240, 240, .75); + -moz-box-shadow: 0 .1em .2em rgba(0,0,0,.75); + -webkit-box-shadow: 0 .1em .2em rgba(0,0,0,.75); + box-shadow: 0 .1em .2em rgba(0,0,0,.75); +} + + + + +/* +** site header +*/ +#site-header-row { + background-color: #424242; + border-bottom-color: #000; +} +#site-header, +#site-header a, +#site-header input[type=submit] { + color: #ccc; +} +#site-header a:focus, +#site-header a:hover, +#search-box input[type=submit]:focus, +#search-box input[type=submit]:hover { + color: #fff; +} + +#primary-navigation a { + background-color: #1B1B1A; + -moz-box-shadow: -.2em -.2em .4em rgba(0,0,0,.25); + -webkit-box-shadow: -.2em -.2em .4em rgba(0,0,0,.25); + box-shadow: -.2em -.2em .4em rgba(0,0,0,.25); +} +#primary-navigation a:focus, +#primary-navigation a:hover { + background-color: #a9a9a9; +} +#primary-navigation .active-trail a { + color: #333; + background-color: #F5F5F5; +} +#secondary-navigation a:focus, +#secondary-navigation a:hover { + text-decoration: underline; +} + +#search-box input[type=text] { + color: #424242; + background-color: #fff; + -moz-box-shadow: inset 0 .1em .25em rgba(0,0,0,.75); + -webkit-box-shadow: inset 0 .1em .25em rgba(0,0,0,.75); + box-shadow: inset 0 .1em .25em rgba(0,0,0,.75); +} +#search-box input[type=submit] { + background-color: #666; + -moz-box-shadow: 0 .1em .2em rgba(0,0,0,.75), + inset .1em .1em .1em rgba(255,255,255,.25), + inset -.1em -.1em .1em rgba(0,0,0,.5); + -webkit-box-shadow: 0 .1em .2em rgba(0,0,0,.75), + inset .1em .1em .1em rgba(255,255,255,.25), + inset -.1em -.1em .1em rgba(0,0,0,.5); + box-shadow: 0 .1em .2em rgba(0,0,0,.75), + inset .1em .1em .1em rgba(255,255,255,.25), + inset -.1em -.1em .1em rgba(0,0,0,.5); + +} +#search-box input[type=submit]:focus, +#search-box input[type=submit]:hover { + background-color: #a9a9a9; +} + + +/* +** dashboard +** layout rules set in jquery.fxAccordion-js.css +*/ + +/* Optimization for fxAccordion transitions. The region forces browsers to push a lot of pixels. */ +.blocks-dashboard-in-transition #dashboard-row, +.blocks-dashboard-in-transition #page-row { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +/* defaults for #page-row and fallback for #dashboard-row. */ +#dashboard-row, +#page-row { + -moz-box-shadow: -.4em .2em .4em rgba(0,0,0,.25); + -webkit-box-shadow: -.4em .2em .4em rgba(0,0,0,.25); + box-shadow: -.4em .2em .4em rgba(0,0,0,.25); +} + +#dashboard-row { + background-color: #e9f9c7; + border-top-color: #47b26a; + border-bottom-color: #51a56e; + -moz-box-shadow: -.4em .2em .4em rgba(0,0,0,.25), + inset 0 .1em .2em rgba(0,0,0,.25); + -webkit-box-shadow: -.4em .2em .4em rgba(0,0,0,.25), + inset 0 .1em .2em rgba(0,0,0,.25); + box-shadow: -.4em .2em .4em rgba(0,0,0,.25), + inset 0 .1em .2em rgba(0,0,0,.25); +} +#dashboard .fx-header { + background-color: #c1e7af; + background-color: rgba(71, 178, 106, .25); +} + +#dashboard .fx-header a { + color: #fff; + background-color: #47b26a; + -moz-box-shadow: .1em .1em .3em rgba(0,0,0,.25); + -webkit-box-shadow: .1em .1em .3em rgba(0,0,0,.25); + box-shadow: .1em .1em .3em rgba(0,0,0,.25); +} +.blocks-dashboard-fx-activated #dashboard .fx-header a { + color: #e9f9c7; +} +.blocks-dashboard-fx-activated #dashboard span.fx-active a { + color: #fff; +} + + +/* +** page content +*/ +#page-row { + background-color: #fff; +} + +.node-title, +.post-data, +.meta .categories, +#content .fx-accordion .fx-header, +#page .fx-accordion .fx-header, +#sidebar ul.menu li a { + border-color: #ebf2ed; + border-color: rgba(50,126,75,0.1); +} +.meta, +.meta a, +.node-links, +.node-links a { + color: #949895; + color: rgba(66,66,66,0.5); +} +.meta .node-type { + color: #ebf2ed; + color: rgba(50,126,75,0.1); +} +.meta li.term { + background: #ebf2ed url(../../images/tag_left.png) no-repeat left center; +} +ul.tabs.primary li, +.meta .author, +.node-links a, +.meta li.term, +.fx-tabs .fx-titles a, +#page .fx-tabs .block, +#page .fx-accordion, +#sidebar .block { + background-color: #ebf2ed; + background-color: rgba(50,126,75,0.1); +} +#sidebar .fx-accordion .block { + background: transparent; +} +ul.tabs.primary li.active, +.meta li.active, +.fx-tabs .fx-titles .fx-active a, +.taxonomy-term-description, +ul.pager li.pager-current { + background-color: #fceb95; + background-color: rgba(249,214,42,0.5); +} + + + + + +/* +** footer +*/ +/* html added for cases where the doesn't fill the viewport */ +html, +#footer-row { + background-color: #E3E1DE; +} \ No newline at end of file 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.1 diff -u -p -r1.1.2.1 node.tpl.php --- Canvas/templates/node.tpl.php 21 May 2010 18:26:54 -0000 1.1.2.1 +++ Canvas/templates/node.tpl.php 8 Jun 2010 11:41:33 -0000 @@ -1,18 +1,5 @@ > - -
-
- -
-
- created) ?> - created) ?>, - created) ?> -
-
- -

@@ -20,14 +7,21 @@ -
- -
- +
+ +
+ + + created) ?> created) ?>, created) ?> + + +
- -
-
+ +
+ +
+
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.1 diff -u -p -r1.1.2.1 page.tpl.php --- Canvas/templates/page.tpl.php 21 May 2010 18:26:54 -0000 1.1.2.1 +++ Canvas/templates/page.tpl.php 8 Jun 2010 11:41:33 -0000 @@ -8,124 +8,143 @@ -> -
-