Index: css/style.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/bartik/css/style.css,v retrieving revision 1.51 diff -u -r1.51 style.css --- css/style.css 27 Apr 2010 18:05:14 -0000 1.51 +++ css/style.css 28 Apr 2010 02:15:55 -0000 @@ -61,6 +61,7 @@ /* ------------------ Reset Styles ------------------ */ table { + border: 1px solid; border-spacing: 0; width: 100%; } @@ -68,6 +69,9 @@ tr.odd { border-bottom: 0; } +thead th { + border-bottom: 1px solid; +} caption, th, td { @@ -399,7 +403,6 @@ #block-system-main .node-teaser .content { font-size: 92%; line-height: 1.65em; - color: #3b3b3b; clear: none; } #block-system-main .meta { @@ -516,7 +519,7 @@ /* ------------------ Sidebar ----------------- */ .sidebar .block { - border: 1px solid #d0d0d0; + border: 1px solid; padding: 15px 20px; margin: 20px 0; } @@ -539,7 +542,6 @@ /* ----------------- Triptych ----------------- */ #triptych-wrapper { - background: #fafafa url(../images/triptych-background.jpg) repeat-x top center; border-top: 1px solid #d3d7d9; } #triptych h2 { @@ -702,6 +704,15 @@ #footer-wrapper tr.even { background-color: #1f1f1f; } +#footer-columns table { + border: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +#footer-columns tbody { + border-top: none; +} /* --------------- System Tabs --------------- */ @@ -816,22 +827,40 @@ /* -------------- Form Elements ------------- */ +form { + padding: 10px 0 0; +} fieldset { - background: #fbfbfb none repeat scroll 0 0; - border: 1px solid #ccc; - padding: 10px 25px; + border: 1px solid; + margin-top: 20px; + padding: 0 15px 10px; + position: relative; -khtml-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } fieldset.collapsed { - background: #fff; + background: transparent; -khtml-border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; } +fieldset legend { + border: 1px solid; + left: auto; + padding: 0 5px; + position: absolute; + top: -13px; + -khtml-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} +.fieldset-wrapper { + margin-top: 20px; +} input { margin: 2px 0; padding: 4px; Index: css/color.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/bartik/css/color.css,v retrieving revision 1.3 diff -u -r1.3 color.css --- css/color.css 27 Apr 2010 18:29:58 -0000 1.3 +++ css/color.css 28 Apr 2010 02:15:54 -0000 @@ -29,4 +29,45 @@ } .sidebar .block { background-color: #feffff; + border-color: #d0d0d0; } +fieldset, +fieldset legend { + background-color: #feffff; + border-color: #d0d0d0; + color: #3b3b3b; +} +fieldset .description { + color: #3b3b3b; +} +#triptych-wrapper { + background-color: #fafafa; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fafafa), to(#ffffff)); + background-image: -moz-linear-gradient(-90deg, #fafafa, #ffffff); +} +table { + border-color: #d0d0d0; + -moz-box-shadow: 3px 3px 3px #d0d0d0; + -webkit-box-shadow: 3px 3px 3px #d0d0d0; + box-shadow: 3px 3px 3px #d0d0d0; +} +thead th { + border-bottom-color: #3b3b3b; + background-color: #000000; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#000000), to(#3d3d3d)); + background-image: -moz-linear-gradient(-90deg, #000000, #3d3d3d); +} +tr.odd { + background-color: #fafafa; +} +tr.even { + background-color: #ffffff; +} +tbody { + border-top-color: #d0d0d0; +} +h1, +h2, +#block-system-main .node-teaser h2 a { + color:#3b3b3b; +} \ No newline at end of file Index: color/color.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/bartik/color/color.inc,v retrieving revision 1.3 diff -u -r1.3 color.inc --- color/color.inc 23 Apr 2010 05:55:00 -0000 1.3 +++ color/color.inc 28 Apr 2010 02:15:54 -0000 @@ -10,9 +10,12 @@ 'bg' => t('Main background'), 'link' => t('Link color'), 'top' => t('Header top'), + 'triptych' => t('Triptych background'), 'bottom' => t('Header bottom'), 'text' => t('Text color'), + 'border' => t('Global border color'), 'sidebar' => t('Sidebar background'), + 'fieldset' => t('Fieldset background'), ), // Pre-defined color schemes. 'schemes' => array( @@ -22,9 +25,12 @@ 'bg' => '#ffffff', 'link' => '#0073b6', 'top' => '#000000', + 'triptych' => '#fafafa', 'bottom' => '#3d3d3d', 'text' => '#3b3b3b', + 'border' => '#d0d0d0', 'sidebar' => '#feffff', + 'fieldset' => '#feffff', ), ), 'Blue Lagoon' => array( @@ -33,9 +39,12 @@ 'bg' => '#ffffff', 'link' => '#0073b6', 'top' => '#2385c2', + 'triptych' => '#fafafa', 'bottom' => '#5ab5ee', 'text' => '#3b3b3b', + 'border' => '#d0d0d0', 'sidebar' => '#feffff', + 'fieldset' => '#feffff', ), ), 'Plum' => array( @@ -44,9 +53,12 @@ 'bg' => '#f6eecc', 'link' => '#6b2454', 'top' => '#461453', + 'triptych' => '#fafafa', 'bottom' => '#6b2454', 'text' => '#2c233f', + 'border' => '#d0d0d0', 'sidebar' => '#f0f0f0', + 'fieldset' => '#f0f0f0', ), ), 'Fresh' => array( @@ -55,9 +67,12 @@ 'bg' => '#f6ffff', 'link' => '#087095', 'top' => '#78b91a', + 'triptych' => '#fafafa', 'bottom' => '#5b8b15', 'text' => '#585858', + 'border' => '#d0d0d0', 'sidebar' => '#feffff', + 'fieldset' => '#feffff', ), ), ), @@ -80,7 +95,7 @@ // Direction of gradient ('vertical' or 'horizontal'). 'direction' => 'vertical', // Keys of colors to use for the gradient. - 'colors' => array('top', 'bottom'), + 'colors' => array('top', 'triptych', 'bottom'), ), ),