? clean-960css.patch Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/ninesixty/README.txt,v retrieving revision 1.3 diff -u -p -r1.3 README.txt --- README.txt 10 Apr 2009 22:19:42 -0000 1.3 +++ README.txt 20 Jun 2009 19:15:20 -0000 @@ -41,8 +41,8 @@ Modifications: It has been extended to support Drupal's rtl language system. - Removed ".clear-fix" and ".clear" classes from 960.css. Drupal works with - ".clear-block" which uses the same technique used in .clear-fix. The .clear - class on the other hand is too commonly used as a class name and the + ".clearfix" which is basically the same technique used in .clear-fix. The + .clear class on the other hand is too commonly used as a class name and the properties can cause confusion since anything with that property will disappear. A standard
tag can be used in its place. @@ -94,6 +94,10 @@ Notes and rules to play nice with the gr + Any element assigned a .push-[N] or .pull-[N] class should also have a + .grid-[N] class. As an alternative, a "position:relative;" rule can be + applied to the element. + - Use the .prefix-[N] and .suffix-[N] classes if you need to fill empty space. Do not confuse this with the .push/pull-[N] classes which can overlap adjacent areas. Index: styles/framework/960-rtl.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/ninesixty/styles/framework/960-rtl.css,v retrieving revision 1.1 diff -u -p -r1.1 960-rtl.css --- styles/framework/960-rtl.css 31 Jan 2009 21:28:46 -0000 1.1 +++ styles/framework/960-rtl.css 20 Jun 2009 19:15:20 -0000 @@ -39,7 +39,7 @@ margin-right: 10px; } -/* `Prefix Extra Space >> Global +/* `Prefix and Suffix Extra Space Reset >> 12 and 16 Columns ----------------------------------------------------------------------------------------------------*/ .container-12 .prefix-1, @@ -71,6 +71,38 @@ padding-left: 0; } +.container-12 .suffix-1, +.container-12 .suffix-2, +.container-12 .suffix-3, +.container-12 .suffix-4, +.container-12 .suffix-5, +.container-12 .suffix-6, +.container-12 .suffix-7, +.container-12 .suffix-8, +.container-12 .suffix-9, +.container-12 .suffix-10, +.container-12 .suffix-11, +.container-16 .suffix-1, +.container-16 .suffix-2, +.container-16 .suffix-3, +.container-16 .suffix-4, +.container-16 .suffix-5, +.container-16 .suffix-6, +.container-16 .suffix-7, +.container-16 .suffix-8, +.container-16 .suffix-9, +.container-16 .suffix-10, +.container-16 .suffix-11, +.container-16 .suffix-12, +.container-16 .suffix-13, +.container-16 .suffix-14, +.container-16 .suffix-15 { + padding-right: 0; +} + +/* `Prefix Extra Space >> Global +----------------------------------------------------------------------------------------------------*/ + .container-12 .prefix-3, .container-16 .prefix-4 { padding-right: 240px; @@ -175,35 +207,6 @@ /* `Suffix Extra Space >> Global ----------------------------------------------------------------------------------------------------*/ -.container-12 .suffix-1, -.container-12 .suffix-2, -.container-12 .suffix-3, -.container-12 .suffix-4, -.container-12 .suffix-5, -.container-12 .suffix-6, -.container-12 .suffix-7, -.container-12 .suffix-8, -.container-12 .suffix-9, -.container-12 .suffix-10, -.container-12 .suffix-11, -.container-16 .suffix-1, -.container-16 .suffix-2, -.container-16 .suffix-3, -.container-16 .suffix-4, -.container-16 .suffix-5, -.container-16 .suffix-6, -.container-16 .suffix-7, -.container-16 .suffix-8, -.container-16 .suffix-9, -.container-16 .suffix-10, -.container-16 .suffix-11, -.container-16 .suffix-12, -.container-16 .suffix-13, -.container-16 .suffix-14, -.container-16 .suffix-15 { - padding-right: 0; -} - .container-12 .suffix-3, .container-16 .suffix-4 { padding-left: 240px; @@ -512,7 +515,3 @@ .container-16 .pull-15 { right: -900px; } - -.container-16 .pull-16 { - right: -960px; -} Index: styles/framework/960.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/ninesixty/styles/framework/960.css,v retrieving revision 1.1 diff -u -p -r1.1 960.css --- styles/framework/960.css 31 Jan 2009 21:28:46 -0000 1.1 +++ styles/framework/960.css 20 Jun 2009 19:15:20 -0000 @@ -6,7 +6,7 @@ Licensed under GPL and MIT. - Modifide for Drupal. + Modified for Drupal. */ /* `Containers @@ -39,7 +39,7 @@ .grid-15, .grid-16 { display: inline; - float: left; /* RTL */ + float: left; position: relative; margin-left: 10px; margin-right: 10px; @@ -65,7 +65,7 @@ width: 940px; } -/* `Grid >> Children (Alpha ~ First, Omega ~ Last) -Has RTL counterpart. +/* `Grid >> Children (Alpha ~ First, Omega ~ Last) ----------------------------------------------------------------------------------------------------*/ .alpha { @@ -162,7 +162,7 @@ width: 880px; } -/* `Prefix Extra Space >> Global -Has RTL counterpart. +/* `Prefix Extra Space >> Global ----------------------------------------------------------------------------------------------------*/ .container-12 .prefix-3, @@ -180,7 +180,7 @@ padding-left: 720px; } -/* `Prefix Extra Space >> 12 Columns -Has RTL counterpart. +/* `Prefix Extra Space >> 12 Columns ----------------------------------------------------------------------------------------------------*/ .container-12 .prefix-1 { @@ -215,7 +215,7 @@ padding-left: 880px; } -/* `Prefix Extra Space >> 16 Columns -Has RTL counterpart. +/* `Prefix Extra Space >> 16 Columns ----------------------------------------------------------------------------------------------------*/ .container-16 .prefix-1 { @@ -266,7 +266,7 @@ padding-left: 900px; } -/* `Suffix Extra Space >> Global -Has RTL counterpart. +/* `Suffix Extra Space >> Global ----------------------------------------------------------------------------------------------------*/ .container-12 .suffix-3, @@ -284,7 +284,7 @@ padding-right: 720px; } -/* `Suffix Extra Space >> 12 Columns -Has RTL counterpart. +/* `Suffix Extra Space >> 12 Columns ----------------------------------------------------------------------------------------------------*/ .container-12 .suffix-1 { @@ -319,7 +319,7 @@ padding-right: 880px; } -/* `Suffix Extra Space >> 16 Columns -Has RTL counterpart. +/* `Suffix Extra Space >> 16 Columns ----------------------------------------------------------------------------------------------------*/ .container-16 .suffix-1 { @@ -370,28 +370,9 @@ padding-right: 900px; } -/* `Push Space >> Global -Has RTL counterpart. +/* `Push Space >> Global ----------------------------------------------------------------------------------------------------*/ -.push-1, -.push-2, -.push-3, -.push-4, -.push-5, -.push-6, -.push-7, -.push-8, -.push-9, -.push-10, -.push-11, -.push-12, -.push-13, -.push-14, -.push-15, -.push-16 { - position: relative; -} - .container-12 .push-3, .container-16 .push-4 { left: 240px; @@ -407,7 +388,7 @@ left: 720px; } -/* `Push Space >> 12 Columns -Has RTL counterpart. +/* `Push Space >> 12 Columns ----------------------------------------------------------------------------------------------------*/ .container-12 .push-1 { @@ -442,7 +423,7 @@ left: 880px; } -/* `Push Space >> 16 Columns -Has RTL counterpart. +/* `Push Space >> 16 Columns ----------------------------------------------------------------------------------------------------*/ .container-16 .push-1 { @@ -493,28 +474,9 @@ left: 900px; } -/* `Pull Space >> Global -Has RTL counterpart. +/* `Pull Space >> Global ----------------------------------------------------------------------------------------------------*/ -.pull-1, -.pull-2, -.pull-3, -.pull-4, -.pull-5, -.pull-6, -.pull-7, -.pull-8, -.pull-9, -.pull-10, -.pull-11, -.pull-12, -.pull-13, -.pull-14, -.pull-15, -.pull-16 { - position: relative; -} - .container-12 .pull-3, .container-16 .pull-4 { left: -240px; @@ -530,7 +492,7 @@ left: -720px; } -/* `Pull Space >> 12 Columns -Has RTL counterpart. +/* `Pull Space >> 12 Columns ----------------------------------------------------------------------------------------------------*/ .container-12 .pull-1 { @@ -565,7 +527,7 @@ left: -880px; } -/* `Pull Space >> 16 Columns -Has RTL counterpart. +/* `Pull Space >> 16 Columns ----------------------------------------------------------------------------------------------------*/ .container-16 .pull-1 { @@ -615,7 +577,3 @@ .container-16 .pull-15 { left: -900px; } - -.container-16 .pull-16 { - left: -960px; -}