diff --git a/INSTALL.txt b/INSTALL.txt index 8f488ac..2f1fd1a 100644 --- INSTALL.txt +++ INSTALL.txt @@ -1,34 +1,51 @@ - $Id +// $Id$ -This is the NineSixty theme (http://drupal.org/project/ninesixty) developed as a Zen sub theme for use with Zen theme (http://drupal.org/project/zen). +This is the NineSixty theme developed as +a Zen sub theme for use with Zen theme . -This theme is only for Drupal 6 +This theme is only for Drupal 6. -INSTALLATION: -- Download Zen Theme for Drupal 6 version (http://drupal.org/project/zen) and unzip this theme into /sites/all/themes/ +INSTALLATION +------------ -- The Zen theme is the based theme that must be installed to have this sub theme work properly +- Download Zen Theme for Drupal 6 version (http://drupal.org/project/zen) and + unzip this theme into sites/all/themes/ -- Now unzip this theme (zen_ninesixty) and place it in your theme directory, so directory path should look like: /sites/all/themes/zen_ninesixty +- The Zen theme is the based theme that must be installed to have this sub theme + work properly. -- Login as admin go to Administer --> themes and enable '960 Grid System (Zen sub theme)' theme (/admin/build/themes) +- Now unzip this theme (zen_ninesixty) and place it in your theme directory, so + directory path should look like: sites/all/themes/zen_ninesixty -- You can configure the theme settings. To do this click on 'configure' link next to the theme in the theme listing page. +- Login as admin and go to Administer > Site building > Themes and enable + '960 Grid System (Zen sub theme)' theme (admin/build/themes) ------------------------------------------- -What's different in this theme compare to the original NineSixty theme: ------------------------------------------- +- You can configure the theme settings. To do this click on 'configure' link + next to the theme in the theme listing page. -- It inherits all the theme settings from the Zen theme (ie inline block editing) -- Added Debug mode (showing grid on the page) as a theme setting so you can enable/disable it in the theme settings (/admin/build/themes/settings/zen_ninesixty) +WHAT'S DIFFERENT IN THIS THEME COMPARE TO THE ORIGINAL NINESIXTY THEME +---------------------------------------------------------------------- -- Additional region added: 'content top' and 'content bottom' so blocks can be assigned to the top or bottom of the main content area. +- It inherits all the theme settings from the Zen theme (ie inline block + editing). -If you have any questions, leave a comment at: http://duvien.com/blog/960-grid-system-zen-sub-theme-drupal-6 +- Added Debug mode (showing grid on the page) as a theme setting so you can + enable/disable it in the theme settings + (admin/build/themes/settings/zen_ninesixty). -Or use the issue queue for this theme on drupal.org at: http://drupal.org/project/issues/zen_ninesixty +- Additional region added: 'content top' and 'content bottom' so blocks can be + assigned to the top or bottom of the main content area. -This theme was developed by duvien (http://duvien.com) +FEEDBACK +-------- + +If you have any questions, leave a comment at: + + +Or use the issue queue for this theme on drupal.org at: + + +This theme was developed by duvien . diff --git a/README.txt b/README.txt index d69027d..2ee0126 100644 --- README.txt +++ README.txt @@ -1,9 +1,15 @@ -$Id +// $Id$ + +NOTE +---- + +- This is a sub theme that can only be use with Zen theme. +- Please do not contact the original developer of NineSixty theme about issues + related to this theme unless your questions are related to the grid itself. + +ABOUT +----- ----------------------------------- -NOTE: This is a sub theme that can only be use with Zen theme -Please do not contact the original developer of NineSixty theme about issues related to this theme unless your questions are related to the grid itself. ----------------------------------- This "framework" theme is based on the 960 Grid System created by Nathan Smith. It is being proposed for the core base theme in Drupal 7. The CSS framework is licenced under GPL and MIT. This Drupal theme is licensed under GPL. @@ -20,20 +26,21 @@ Background information on 960: http://sonspring.com/journal/960-grid-system Write-up from DivitoDesign: - http://www.divitodesign.com/2008/12/960-css-framework-learn-basics/ + http://www.divitodesign.com/2008/12/960-css-framework-learn-basics Write-up from Nettus: - http://nettuts.com/videos/screencasts/a-detailed-look-at-the-960-css-framework/ - http://nettuts.com/tutorials/html-css-techniques/prototyping-with-the-grid-960-css-framework/ + http://nettuts.com/videos/screencasts/a-detailed-look-at-the-960-css-framework + http://nettuts.com/tutorials/html-css-techniques/prototyping-with-the-grid-960-css-framework General idea behind a CSS framework: http://www.alistapart.com/articles/frameworksfordesigners Extensive overview on working within grids: - http://www.smashingmagazine.com/2007/04/14/designing-with-grid-based-approach/ + http://www.smashingmagazine.com/2007/04/14/designing-with-grid-based-approach -============================================================================== -Modifications: + +MODIFICATIONS +------------- - The 960 Grid System package has been modified so it conforms to Drupal's coding standards. Tabs were removed for double spaces and underscores @@ -58,8 +65,9 @@ Modifications: - Removed the large left margin for list items inside text.css. It interferes in many places. -============================================================================== -Notes and rules to play nice with the grids: + +NOTES AND RULES TO PLAY NICE WITH THE GRIDS +------------------------------------------- - The class .container-[N] ([N] being a numeric value) is a subdivision of the overall width (960 pixels). It can either be .container-12 or .container-16. @@ -112,27 +120,11 @@ Notes and rules to play nice with the grids: visual order than the source order when using the push/pull classes. As long as you stay within the framework, any browser positioning quirks -_especially from IE_ should be minimal. +_especially from IE_ should be minimal. -============================================================================== -To-dos: -- * Update: see next section * - Helper function to calculate grid classes based on context. The standard - $body_classes within page.tpl.php which contains the state of the sidebars - will be less useful in this grid system. It's often used to change the width - of the content region depending on the presence of sidebars. This new helper - function will need to replace that functionality. It also gives us an - opportunity to have a more flexible system. Instead of focusing on sidebars, - it can be more fine grained in its awareness of adjacent grids and push out - classes appropriately. This helper function must be as simple as possible to - *work with*. - -- Separate issue but this can help add grid classes easier. - Add $classes to hook templates: http://drupal.org/node/306358 - -============================================================================== -Adding classes based on context: +ADDING CLASSES BASED ON CONTEXT +------------------------------- The function "ns()" can be used to add classes contextually. The first argument should be the default class with the highest possible unit. The rest of the @@ -218,25 +210,27 @@ The main points to remember are these: exclamation mark before the variable to subtract when it *does not* contain a value. -============================================================================== -Problem with .clearfix and .clear-block in IE: + +PROBLEM WITH .clearfix AND .clear-block in IE +--------------------------------------------- The .clearfix (aka .clear-block) method of clearing divs does not always play well with 960.gs in IE6 (haven't tried IE7). The problem is twofold: - 1. If a div is assigned a container-X class, you must add the clearfix class - after it, like so: -
+1. If a div is assigned a container-X class, you must add the clearfix class + after it, like so: +
- 2. If a div is assigned a grid-X class, adding clearfix will break your - layout. You must used an "inner" div instead, like so: -
My content
+2. If a div is assigned a grid-X class, adding clearfix will break your + layout. You must used an "inner" div instead, like so: +
My content
-This problem has been seen in IE6. IE7 has not yet been tested. Please see -this issue for more information: http://drupal.org/node/422240 +This problem has been seen in IE6. IE7 has not yet been tested. Please see this +issue for more information: http://drupal.org/node/422240 -============================================================================== + +FEEDBACK +-------- If you have any questions or suggestions. Please post in the group discussion. http://groups.drupal.org/node/16457 or contact me @ joon at dvessel dot com. - diff --git a/block-editing.css b/block-editing.css index 65230c3..0533b35 100644 --- block-editing.css +++ block-editing.css @@ -1,28 +1,25 @@ /* $Id: block-editing.css,v 1.1 2009/06/26 00:33:39 duvien Exp $ */ -/* +/** * Rollover edit links for blocks */ - div.block.with-block-editing - { - position: relative; - } +div.block.with-block-editing { + position: relative; +} - div.block.with-block-editing div.edit - { - display: none; - position: absolute; - right: 0; - top: 0; - z-index: 40; - border: 1px solid #eee; - padding: 0 2px; - font-size: 9px; - background-color: #fff; - } +div.block.with-block-editing div.edit { + display: none; + position: absolute; + right: 0; + top: 0; + z-index: 40; + border: 1px solid #eee; + padding: 0 2px; + font-size: 9px; + background-color: #fff; +} - div.block.with-block-editing:hover div.edit - { - display: block; - } +div.block.with-block-editing:hover div.edit { + display: block; +} diff --git a/block.tpl.php b/block.tpl.php index f0f80ef..d6a0ba4 100644 --- block.tpl.php +++ block.tpl.php @@ -13,8 +13,8 @@ * - $block->delta: This is a numeric id connected to each module. * - $block->region: The block region embedding the current block. * - $classes: A set of CSS classes for the DIV wrapping the block. - Possible values are: block-MODULE, region-odd, region-even, odd, even, - region-count-X, and count-X. + * Possible values are: block-MODULE, region-odd, region-even, odd, even, + * region-count-X, and count-X. * * Helper variables: * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region. diff --git a/framework/960-rtl.css b/framework/960-rtl.css index d6de6a9..3925970 100644 --- framework/960-rtl.css +++ framework/960-rtl.css @@ -1,12 +1,10 @@ /* $Id: 960-rtl.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ -/* - Addon for Drupal's right to left language support. -*/ - -/* `Grid >> Global -----------------------------------------------------------------------------------------------------*/ +/** + * Addon for Drupal's right to left language support. + */ +/* Grid >> Global */ .grid-1, .grid-2, .grid-3, @@ -26,9 +24,7 @@ float: right; } -/* `Grid >> Children (Alpha ~ First, Omega ~ Last) -----------------------------------------------------------------------------------------------------*/ - +/* Grid >> Children (Alpha ~ First, Omega ~ Last) */ .alpha { margin-left: 10px; margin-right: 0; @@ -39,9 +35,7 @@ margin-right: 10px; } -/* `Prefix Extra Space >> Global -----------------------------------------------------------------------------------------------------*/ - +/* Prefix Extra Space >> Global */ .container-12 .prefix-1, .container-12 .prefix-2, .container-12 .prefix-3, @@ -86,8 +80,7 @@ padding-right: 720px; } -/* `Prefix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ +/* Prefix Extra Space >> 12 Columns */ .container-12 .prefix-1 { padding-right: 80px; @@ -121,9 +114,7 @@ padding-right: 880px; } -/* `Prefix Extra Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Prefix Extra Space >> 16 Columns */ .container-16 .prefix-1 { padding-right: 60px; } @@ -172,9 +163,7 @@ padding-right: 900px; } -/* `Suffix Extra Space >> Global -----------------------------------------------------------------------------------------------------*/ - +/* Suffix Extra Space >> Global */ .container-12 .suffix-1, .container-12 .suffix-2, .container-12 .suffix-3, @@ -219,9 +208,7 @@ padding-left: 720px; } -/* `Suffix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Suffix Extra Space >> 12 Columns */ .container-12 .suffix-1 { padding-left: 80px; } @@ -254,8 +241,7 @@ padding-left: 880px; } -/* `Suffix Extra Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ +/* Suffix Extra Space >> 16 Columns */ .container-16 .suffix-1 { padding-left: 60px; @@ -305,9 +291,7 @@ padding-left: 900px; } -/* `Push Space >> Global -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> Global */ .container-12 .push-3, .container-16 .push-4 { right: 240px; @@ -323,9 +307,7 @@ right: 720px; } -/* `Push Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> 12 Columns */ .container-12 .push-1 { right: 80px; } @@ -358,9 +340,7 @@ right: 880px; } -/* `Push Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> 16 Columns */ .container-16 .push-1 { right: 60px; } @@ -409,8 +389,7 @@ right: 900px; } -/* `Pull Space >> Global -----------------------------------------------------------------------------------------------------*/ +/* Pull Space >> Global */ .container-12 .pull-3, .container-16 .pull-4 { @@ -427,9 +406,7 @@ right: -720px; } -/* `Pull Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Pull Space >> 12 Columns */ .container-12 .pull-1 { right: -80px; } @@ -462,9 +439,7 @@ right: -880px; } -/* `Pull Space >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Pull Space >> 16 Columns */ .container-16 .pull-1 { right: -60px; } diff --git a/framework/960.css b/framework/960.css index a0b54cc..ff8297e 100644 --- framework/960.css +++ framework/960.css @@ -1,17 +1,13 @@ /* $Id: 960.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ -/* - 960 Grid System ~ Core CSS. - Learn more ~ http://960.gs/ - - Licensed under GPL and MIT. - - Modifide for Drupal. -*/ - -/* `Containers -----------------------------------------------------------------------------------------------------*/ - +/** + * 960 Grid System ~ Core CSS. + * Learn more ~ http://960.gs/ + * Licensed under GPL and MIT. + * Modified for Drupal. + */ + +/* Containers */ .container-12, .container-16 { margin-left: auto; @@ -19,9 +15,7 @@ width: 960px; } -/* `Grid >> Global -----------------------------------------------------------------------------------------------------*/ - +/* Grid >> Global */ .grid-1, .grid-2, .grid-3, @@ -65,9 +59,7 @@ width: 940px; } -/* `Grid >> Children (Alpha ~ First, Omega ~ Last) -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Grid >> Children (Alpha ~ First, Omega ~ Last) - Has RTL counterpart. */ .alpha { margin-left: 0; } @@ -76,9 +68,7 @@ margin-right: 0; } -/* `Grid >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Grid >> 12 Columns */ .container-12 .grid-1 { width: 60px; } @@ -111,9 +101,7 @@ width: 860px; } -/* `Grid >> 16 Columns -----------------------------------------------------------------------------------------------------*/ - +/* Grid >> 16 Columns */ .container-16 .grid-1 { width: 40px; } @@ -162,9 +150,7 @@ width: 880px; } -/* `Prefix Extra Space >> Global -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Prefix Extra Space >> Global -Has RTL counterpart. */ .container-12 .prefix-3, .container-16 .prefix-4 { padding-left: 240px; @@ -180,9 +166,7 @@ padding-left: 720px; } -/* `Prefix Extra Space >> 12 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Prefix Extra Space >> 12 Columns -Has RTL counterpart. */ .container-12 .prefix-1 { padding-left: 80px; } @@ -215,9 +199,7 @@ padding-left: 880px; } -/* `Prefix Extra Space >> 16 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Prefix Extra Space >> 16 Columns -Has RTL counterpart. */ .container-16 .prefix-1 { padding-left: 60px; } @@ -266,9 +248,7 @@ padding-left: 900px; } -/* `Suffix Extra Space >> Global -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Suffix Extra Space >> Global -Has RTL counterpart. */ .container-12 .suffix-3, .container-16 .suffix-4 { padding-right: 240px; @@ -284,9 +264,7 @@ padding-right: 720px; } -/* `Suffix Extra Space >> 12 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Suffix Extra Space >> 12 Columns -Has RTL counterpart. */ .container-12 .suffix-1 { padding-right: 80px; } @@ -319,9 +297,7 @@ padding-right: 880px; } -/* `Suffix Extra Space >> 16 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Suffix Extra Space >> 16 Columns -Has RTL counterpart. */ .container-16 .suffix-1 { padding-right: 60px; } @@ -370,9 +346,7 @@ padding-right: 900px; } -/* `Push Space >> Global -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> Global -Has RTL counterpart. */ .push-1, .push-2, .push-3, @@ -407,9 +381,7 @@ left: 720px; } -/* `Push Space >> 12 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> 12 Columns -Has RTL counterpart. */ .container-12 .push-1 { left: 80px; } @@ -442,9 +414,7 @@ left: 880px; } -/* `Push Space >> 16 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Push Space >> 16 Columns -Has RTL counterpart. */ .container-16 .push-1 { left: 60px; } @@ -493,9 +463,7 @@ left: 900px; } -/* `Pull Space >> Global -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Pull Space >> Global -Has RTL counterpart. */ .pull-1, .pull-2, .pull-3, @@ -530,9 +498,7 @@ left: -720px; } -/* `Pull Space >> 12 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Pull Space >> 12 Columns -Has RTL counterpart. */ .container-12 .pull-1 { left: -80px; } @@ -565,9 +531,7 @@ left: -880px; } -/* `Pull Space >> 16 Columns -Has RTL counterpart. -----------------------------------------------------------------------------------------------------*/ - +/* Pull Space >> 16 Columns -Has RTL counterpart. */ .container-16 .pull-1 { left: -60px; } diff --git a/framework/reset.css b/framework/reset.css index a2f3323..28ba0be 100644 --- framework/reset.css +++ framework/reset.css @@ -1,13 +1,13 @@ /* $Id: reset.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ /** - * Eric Meyer's Reset CSS + * Eric Meyer's Reset CSS. * * v1.0 | 20080212 * http://meyerweb.com/eric/tools/css/reset/ * * Changes to the original Reset CSS: - * - "outline" attributes have been commented out for accessibility reasons + * - "outline" attributes have been commented out for accessibility reasons. */ html, body, div, span, applet, object, iframe, @@ -22,14 +22,16 @@ table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; -/* outline: 0; */ + /* outline: 0; */ font-size: 100%; vertical-align: baseline; background: transparent; } -/* Warning: this may add 1-2 pixels to bottom of page */ -/* See http://drupal.org/node/422006 */ +/** + * Warning: this may add 1-2 pixels to bottom of page + * See http://drupal.org/node/422006 + */ body { line-height: 1; } @@ -48,20 +50,25 @@ q:before, q:after { content: none; } -/* remember to define focus styles! +/** + * Remember to define focus styles! + */ +/* :focus { outline: 0; -} */ +} +*/ -/* remember to highlight inserts somehow! */ +/* Remember to highlight inserts somehow! */ ins { text-decoration: none; } + del { text-decoration: line-through; } -/* tables still need cellspacing="0" in the markup */ +/* Tables still need cellspacing="0" in the markup. */ table { border-collapse: collapse; border-spacing: 0; diff --git a/framework/text.css b/framework/text.css index fb73de2..23c2a6d 100644 --- framework/text.css +++ framework/text.css @@ -1,16 +1,12 @@ /* $Id: text.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ -/* - 960 Grid System ~ Text CSS. - Learn more ~ http://960.gs/ - - Licensed under GPL and MIT. - - Modifide for Drupal. -*/ - -/* `Basic HTML -----------------------------------------------------------------------------------------------------*/ +/** + * 960 Grid System ~ Text CSS. + * Learn more ~ http://960.gs/ + * Licensed under GPL and MIT. + * + * Modified for Drupal. + */ body { font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif; @@ -24,9 +20,7 @@ hr { height: 0; } -/* `Headings -----------------------------------------------------------------------------------------------------*/ - +/* Headings */ h1 { font-size: 25px; } @@ -51,9 +45,7 @@ h6 { font-size: 15px; } -/* `Spacing -----------------------------------------------------------------------------------------------------*/ - +/* Spacing */ ol { list-style: decimal; } diff --git a/ie.css b/ie.css index e216fbe..2f0c956 100644 --- ie.css +++ ie.css @@ -1,6 +1,6 @@ /* $Id: ie.css,v 1.2 2009/07/05 20:01:10 duvien Exp $ */ -/* +/** * IE CSS * * CSS targeted specifically for Internet Explorer for Windows. @@ -13,148 +13,130 @@ * Properties starting with head:first-child+body are for IE7 only. * Properties with a child selector (>) or sibling selector (+) are for IE7 only. * + * References: + * + * 1. http://www.positioniseverything.net/explorer/doubled-margin.html + * 2. http://browservulsel.blogspot.com/2005/04/ie-overflow-auto-scrollbar-overlap.html + * 3. http://www.howtocreate.co.uk/wrongWithIE/?chapter=overflow%3Avisible%3B */ -/* - * Layout CSS - */ - -/** body **/ - body - { - _text-align: center; /* 1st part of IE5/IE6quirks centering hack */ - } - - #page - { - _text-align: left; /* 2nd part of IE5/IE6quirks centering hack */ - } - -/** main (container for everything else) **/ - #main - { - _zoom: 1; /* Otherwise with a liquid layout, sidebars disappear when resizing the windows in IE6 */ - } - - /**************************/ -/* ALPHA TRANSPARENCY FIX */ -/**************************/ - span#logo img, - div.pngfix - { - behavior: url(/sites/all/themes/zen_ninesixty/iepngfix.htc); /* update directory path here and in iepngfix.htc to match theme location */ - } - - -/** floating divs **/ - #content, - #navbar, - #sidebar-left, - #sidebar-right - { - _display: inline; /* display inline or double your floated margin! [1] */ - _overflow: hidden; /* in ie6, overflow auto is broken [2] and so is overflow visible [3] */ - _overflow-y: visible; - } - - -/* - * Tabs CSS - IE 5 and 6 don't support PNGs with alpha transparency. - */ - - ul.primary li a, - ul.primary li a .tab, - ul.secondary li a, - ul.secondary li a .tab - { - _display: inline; /* Otherwise the blocks mistakenly get 100% width in IE5 */ - _di\splay: inline-block; /* Otherwise the blocks mistakenly get 100% width in IE6 */ - cursor: pointer; - } - - ul.primary, - ul.secondary - { - _width: 100%; /* Otherwise IE5 treats the ul as floated */ - _w\idth: auto; /* Reset to auto width for IE6 */ - } - - ul.primary li a - { - _background: url(images/tab-left-ie6.png) no-repeat left -38px; - } - - ul.primary li a .tab - { - _background: url(images/tab-right-ie6.png) no-repeat right -38px; - } - - ul.primary li a:hover - { - _background: url(images/tab-left-ie6.png) no-repeat left -76px; - } - - ul.primary li a:hover .tab - { - _background: url(images/tab-right-ie6.png) no-repeat right -76px; - } - - ul.primary li.active a, - ul.primary li.active a:hover - { - _background: url(images/tab-left-ie6.png) no-repeat left 0; - } - - ul.primary li.active a .tab, - ul.primary li.active a:hover .tab - { - _background: url(images/tab-right-ie6.png) no-repeat right 0; - } - -/* +body { + /* 1st part of IE5/IE6 quirks centering hack. */ + _text-align: center; +} + +#page { + /* 2nd part of IE5/IE6 quirks centering hack. */ + _text-align: left; +} + +/* Main (container for everything else). */ +#main { + /* + * Otherwise with a liquid layout, sidebars disappear when resizing the + * windows in IE6. + */ + _zoom: 1; +} + +/* Alpha transparency fix. */ +span#logo img, +div.pngfix { + /* Update directory path here and in iepngfix.htc to match theme location. */ + behavior: url(/sites/all/themes/zen_ninesixty/iepngfix.htc); +} + +/* Floating divs */ +#content, +#navbar, +#sidebar-left, +#sidebar-right { + /* Display inline or double your floated margin! [1]. */ + _display: inline; + /* In IE6, overflow auto is broken [2] and so is overflow visible [3]. */ + _overflow: hidden; + _overflow-y: visible; +} + +/* Tabs CSS - IE5 and 6 don't support PNGs with alpha transparency. */ +ul.primary li a, +ul.primary li a .tab, +ul.secondary li a, +ul.secondary li a .tab { + /* Otherwise the blocks mistakenly get 100% width in IE5. */ + _display: inline; + /* Otherwise the blocks mistakenly get 100% width in IE6. */ + _di\splay: inline-block; + cursor: pointer; +} + +ul.primary, +ul.secondary { + /* Otherwise IE5 treats the ul as floated. */ + _width: 100%; + /* Reset to auto width for IE6. */ + _w\idth: auto; +} + +ul.primary li a { + _background: url(images/tab-left-ie6.png) no-repeat left -38px; +} + +ul.primary li a .tab { + _background: url(images/tab-right-ie6.png) no-repeat right -38px; +} + +ul.primary li a:hover { + _background: url(images/tab-left-ie6.png) no-repeat left -76px; +} + +ul.primary li a:hover .tab { + _background: url(images/tab-right-ie6.png) no-repeat right -76px; +} + +ul.primary li.active a, +ul.primary li.active a:hover { + _background: url(images/tab-left-ie6.png) no-repeat left 0; +} + +ul.primary li.active a .tab, +ul.primary li.active a:hover .tab { + _background: url(images/tab-right-ie6.png) no-repeat right 0; +} + +/** * Messages - IE 5 and 6 don't support PNGs with alpha transparency. */ - div.messages, /* Important messages (status, warning, and error) for the user */ - div.status, - div.warning, - div.error - { - _background-image: url(images/messages-status-ie6.png); - } - - div.warning /* Medium priority messages */ - { - _background-image: url(images/messages-warning-ie6.png); - } - - div.error /* High priority messages. See also the .error declaration below. */ - { - _background-image: url(images/messages-error-ie6.png); - } - -/** Drupal nodes **/ - .node-unpublished .node-inner>* - { - position: relative; /* Otherwise these elements will appear below the "Unpublished" text. */ - } - -/** Drupal admin tables **/ - .section-admin #content tr.even th, - .section-admin #content tr.even td, - .section-admin #content tr.odd th, - .section-admin #content tr.odd td - { - border-bottom: 1px solid #ccc; /* IE doesn't display borders on table rows */ - } - -/* - * REFERENCES - * - -1. http://www.positioniseverything.net/explorer/doubled-margin.html -2. http://browservulsel.blogspot.com/2005/04/ie-overflow-auto-scrollbar-overlap.html -3. http://www.howtocreate.co.uk/wrongWithIE/?chapter=overflow%3Avisible%3B - - * - */ +/* Important messages (status, warning, and error) for the user. */ +div.messages, +div.status, +div.warning, +div.error { + _background-image: url(images/messages-status-ie6.png); +} + +/* Medium priority messages. */ +div.warning { + _background-image: url(images/messages-warning-ie6.png); +} + +/* High priority messages. See also the .error declaration below. */ +div.error { + _background-image: url(images/messages-error-ie6.png); +} + +/* Drupal nodes. */ +.node-unpublished .node-inner>* { + /* Otherwise these elements will appear below the "Unpublished" text. */ + position: relative; +} + +/* Drupal admin tables. */ +.section-admin #content tr.even th, +.section-admin #content tr.even td, +.section-admin #content tr.odd th, +.section-admin #content tr.odd td { + /* IE doesn't display borders on table rows. */ + border-bottom: 1px solid #CCC; +} diff --git a/messages.css b/messages.css index d38f8e7..fe70cca 100644 --- messages.css +++ messages.css @@ -1,61 +1,56 @@ /* $Id: messages.css,v 1.1 2009/06/26 00:33:39 duvien Exp $ */ -/* - * MESSAGES STYLE - * - * Add sensible messages styling. +/** + * Messages styles. Add sensible messages styling. */ - - div.messages, /* Important messages (status, warning, and error) for the user */ - div.status, - div.warning, - div.error - { - min-height: 21px; - margin: 0 1em 5px 1em; - border: 2px solid #ff7; - padding: 5px 5px 5px 35px; - color: #000; - background-color: #ffc; - background-image: url(images/messages-status.png); - background-repeat: no-repeat; - background-position: 5px 5px; - } - - div.status /* Normal priority messages */ - { - } - - div.warning /* Medium priority messages */ - { - border-color: #fc0; - background-image: url(images/messages-warning.png); - } - - div.warning, - tr.warning - { - color: #000; /* Drupal core uses #220 */ - background-color: #ffc; - } - - div.error /* High priority messages. See also the .error declaration below. */ - { - /* border: 1px solid #d77; */ /* Drupal core uses: 1px solid #d77 */ - border-color: #c00; - background-image: url(images/messages-error.png); - } - - div.error, - tr.error - { - color: #900; /* Drupal core uses #200 */ - background-color: #fee; - } - - div.messages ul - { - margin-top: 0; - margin-bottom: 0; - } +/* Important messages (status, warning, and error) for the user. */ +div.messages, +div.status, +div.warning, +div.error { + min-height: 21px; + margin: 0 1em 5px 1em; + border: 2px solid #ff7; + padding: 5px 5px 5px 35px; + color: #000; + background-color: #ffc; + background-image: url(images/messages-status.png); + background-repeat: no-repeat; + background-position: 5px 5px; +} + +/* Normal priority messages. */ +div.status { +} + +/* Medium priority messages. */ +div.warning { + border-color: #fc0; + background-image: url(images/messages-warning.png); +} + +div.warning, +tr.warning { + /* Drupal core uses #220 */ + color: #000; + background-color: #FFC; +} + +/* High priority messages. See also the .error declaration below. */ +div.error { + border-color: #C00; + background-image: url(images/messages-error.png); +} + +div.error, +tr.error { + /* Drupal core uses #200 */ + color: #900; + background-color: #FEE; +} + +div.messages ul { + margin-top: 0; + margin-bottom: 0; +} diff --git a/node.tpl.php b/node.tpl.php index 40f7d23..b3231b9 100644 --- node.tpl.php +++ node.tpl.php @@ -71,7 +71,7 @@ -
+
@@ -82,4 +82,4 @@ -
\ No newline at end of file + diff --git a/page.tpl.php b/page.tpl.php index 528462e..ae04dc2 100644 --- page.tpl.php +++ page.tpl.php @@ -1,8 +1,7 @@ - + @@ -16,27 +15,30 @@
+ -
+
-
+
-
-
+
+
-

+

-
+
@@ -98,19 +100,19 @@ - -
- -
- + +
+ +
+ -
-
-
+
+
+