diff --git framework/960-rtl.css framework/960-rtl.css index d6de6a9..5541068 100644 --- framework/960-rtl.css +++ framework/960-rtl.css @@ -1,4 +1,4 @@ -/* $Id: 960-rtl.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ +/* $Id: 960-rtl.css,v 1.1.2.1 2009/06/20 19:25:54 dvessel Exp $ */ /* Addon for Drupal's right to left language support. @@ -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; -} diff --git framework/960.css framework/960.css index a0b54cc..b1ce2cc 100644 --- framework/960.css +++ framework/960.css @@ -1,4 +1,4 @@ -/* $Id: 960.css,v 1.1 2009/06/26 00:33:40 duvien Exp $ */ +/* $Id: 960.css,v 1.1.2.1 2009/06/20 19:25:54 dvessel Exp $ */ /* 960 Grid System ~ Core CSS. @@ -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; -}