Index: styles/framework/960.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/ninesixty/styles/framework/960.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 960.css
--- styles/framework/960.css	20 Jun 2009 19:25:54 -0000	1.1.2.1
+++ styles/framework/960.css	21 Mar 2010 23:14:09 -0000
@@ -13,7 +13,8 @@
 ----------------------------------------------------------------------------------------------------*/
 
 .container-12,
-.container-16 {
+.container-16,
+.container-24 {
   margin-left: auto;
   margin-right: auto;
   width: 960px;
@@ -37,7 +38,15 @@
 .grid-13,
 .grid-14,
 .grid-15,
-.grid-16 {
+.grid-16,
+.grid-17,
+.grid-18,
+.grid-19,
+.grid-20,
+.grid-21,
+.grid-22,
+.grid-23,
+.grid-24 {
   display: inline;
   float: left;
   position: relative;
@@ -45,6 +54,34 @@
   margin-right: 10px;
 }
 
+.container-24 .grid-1,
+.container-24 .grid-2,
+.container-24 .grid-3,
+.container-24 .grid-4,
+.container-24 .grid-5,
+.container-24 .grid-6,
+.container-24 .grid-7,
+.container-24 .grid-8,
+.container-24 .grid-9,
+.container-24 .grid-10,
+.container-24 .grid-11,
+.container-24 .grid-12,
+.container-24 .grid-13,
+.container-24 .grid-14,
+.container-24 .grid-15,
+.container-24 .grid-16,
+.container-24 .grid-17,
+.container-24 .grid-18,
+.container-24 .grid-19,
+.container-24 .grid-20,
+.container-24 .grid-21,
+.container-24 .grid-22,
+.container-24 .grid-23,
+.container-24 .grid-24 {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
 .container-12 .grid-3,
 .container-16 .grid-4 {
   width: 220px;
@@ -162,56 +199,183 @@
   width: 880px;
 }
 
-/* `Prefix Extra Space >> Global
+/* `Grid >> 24 Columns
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .prefix-3,
-.container-16 .prefix-4 {
-  padding-left: 240px;
+.container-24 .grid-1 {
+  width: 30px;
 }
 
-.container-12 .prefix-6,
-.container-16 .prefix-8 {
-  padding-left: 480px;
+.container-24 .grid-2 {
+  width: 70px;
 }
 
-.container-12 .prefix-9,
-.container-16 .prefix-12 {
-  padding-left: 720px;
+.container-24 .grid-3 {
+  width: 110px;
+}
+
+.container-24 .grid-4 {
+  width: 150px;
+}
+
+.container-24 .grid-5 {
+  width: 190px;
+}
+
+.container-24 .grid-6 {
+  width: 230px;
+}
+
+.container-24 .grid-7 {
+  width: 270px;
+}
+
+.container-24 .grid-8 {
+  width: 310px;
+}
+
+.container-24 .grid-9 {
+  width: 350px;
+}
+
+.container-24 .grid-10 {
+  width: 390px;
+}
+
+.container-24 .grid-11 {
+  width: 430px;
+}
+
+.container-24 .grid-12 {
+  width: 470px;
+}
+
+.container-24 .grid-13 {
+  width: 510px;
+}
+
+.container-24 .grid-14 {
+  width: 550px;
+}
+
+.container-24 .grid-15 {
+  width: 590px;
+}
+
+.container-24 .grid-16 {
+  width: 630px;
 }
 
-/* `Prefix Extra Space >> 12 Columns
+.container-24 .grid-17 {
+  width: 670px;
+}
+
+.container-24 .grid-18 {
+  width: 710px;
+}
+
+.container-24 .grid-19 {
+  width: 750px;
+}
+
+.container-24 .grid-20 {
+  width: 790px;
+}
+
+.container-24 .grid-21 {
+  width: 830px;
+}
+
+.container-24 .grid-22 {
+  width: 870px;
+}
+
+.container-24 .grid-23 {
+  width: 910px;
+}
+
+.container-24 .grid-24 {
+  width: 950px;
+}
+
+/* `Prefix Extra Space >> Global
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .prefix-1 {
+.container-12 .prefix-1,
+.container-24 .prefix-2 {
   padding-left: 80px;
 }
 
-.container-12 .prefix-2 {
+.container-16 .prefix-2,
+.container-24 .prefix-3 {
+  padding-left: 120px;
+}
+
+.container-12 .prefix-2,
+.container-24 .prefix-4 {
   padding-left: 160px;
 }
 
-.container-12 .prefix-4 {
+.container-12 .prefix-3,
+.container-16 .prefix-4,
+.container-24 .prefix-6 {
+  padding-left: 240px;
+}
+
+.container-12 .prefix-4,
+.container-24 .prefix-8 {
   padding-left: 320px;
 }
 
-.container-12 .prefix-5 {
+.container-16 .prefix-6,
+.container-24 .prefix-9 {
+  padding-left: 360px;
+}
+
+.container-12 .prefix-5,
+.container-24 .prefix-10 {
   padding-left: 400px;
 }
 
-.container-12 .prefix-7 {
+.container-12 .prefix-6,
+.container-16 .prefix-8,
+.container-24 .prefix-12 {
+  padding-left: 480px;
+}
+
+.container-12 .prefix-7,
+.container-24 .prefix-14 {
   padding-left: 560px;
 }
 
-.container-12 .prefix-8 {
+.container-16 .prefix-10,
+.container-24 .prefix-15 {
+  padding-left: 600px;
+}
+
+.container-12 .prefix-8,
+.container-24 .prefix-16 {
   padding-left: 640px;
 }
 
-.container-12 .prefix-10 {
+.container-12 .prefix-9,
+.container-16 .prefix-12,
+.container-24 .prefix-18 {
+  padding-left: 720px;
+}
+
+.container-12 .prefix-10,
+.container-24 .prefix-20 {
   padding-left: 800px;
 }
 
-.container-12 .prefix-11 {
+.container-16 .prefix-14,
+.container-24 .prefix-21 {
+  padding-left: 840px;
+}
+
+.container-12 .prefix-11,
+.container-24 .prefix-22 {
   padding-left: 880px;
 }
 
@@ -222,10 +386,6 @@
   padding-left: 60px;
 }
 
-.container-16 .prefix-2 {
-  padding-left: 120px;
-}
-
 .container-16 .prefix-3 {
   padding-left: 180px;
 }
@@ -234,10 +394,6 @@
   padding-left: 300px;
 }
 
-.container-16 .prefix-6 {
-  padding-left: 360px;
-}
-
 .container-16 .prefix-7 {
   padding-left: 420px;
 }
@@ -246,10 +402,6 @@
   padding-left: 540px;
 }
 
-.container-16 .prefix-10 {
-  padding-left: 600px;
-}
-
 .container-16 .prefix-11 {
   padding-left: 660px;
 }
@@ -258,64 +410,123 @@
   padding-left: 780px;
 }
 
-.container-16 .prefix-14 {
-  padding-left: 840px;
-}
-
 .container-16 .prefix-15 {
   padding-left: 900px;
 }
 
-/* `Suffix Extra Space >> Global
+/* `Prefix Extra Space >> 24 Columns
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .suffix-3,
-.container-16 .suffix-4 {
-  padding-right: 240px;
+.container-24 .prefix-1 {
+  padding-left: 40px;
 }
 
-.container-12 .suffix-6,
-.container-16 .suffix-8 {
-  padding-right: 480px;
+.container-24 .prefix-3 {
+  padding-left: 120px;
 }
 
-.container-12 .suffix-9,
-.container-16 .suffix-12 {
-  padding-right: 720px;
+.container-24 .prefix-5 {
+  padding-left: 200px;
 }
 
-/* `Suffix Extra Space >> 12 Columns
+.container-24 .prefix-7 {
+  padding-left: 280px;
+}
+
+.container-24 .prefix-11 {
+  padding-left: 440px;
+}
+
+.container-24 .prefix-13 {
+  padding-left: 520px;
+}
+
+.container-24 .prefix-17 {
+  padding-left: 680px;
+}
+
+.container-24 .prefix-23 {
+  padding-left: 920px;
+}
+
+/* `Suffix Extra Space >> Global
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .suffix-1 {
+.container-12 .suffix-1,
+.container-24 .suffix-2 {
   padding-right: 80px;
 }
 
-.container-12 .suffix-2 {
+.container-16 .suffix-2,
+.container-24 .suffix-3 {
+  padding-right: 120px;
+}
+
+.container-12 .suffix-2,
+.container-24 .suffix-4 {
   padding-right: 160px;
 }
 
-.container-12 .suffix-4 {
+.container-12 .suffix-3,
+.container-16 .suffix-4,
+.container-24 .suffix-6 {
+  padding-right: 240px;
+}
+
+.container-12 .suffix-4,
+.container-24 .suffix-8 {
   padding-right: 320px;
 }
 
-.container-12 .suffix-5 {
+.container-16 .suffix-6,
+.container-24 .suffix-9 {
+  padding-right: 360px;
+}
+
+.container-12 .suffix-5,
+.container-24 .suffix-10 {
   padding-right: 400px;
 }
 
-.container-12 .suffix-7 {
+.container-12 .suffix-6,
+.container-16 .suffix-8,
+.container-24 .suffix-12 {
+  padding-right: 480px;
+}
+
+.container-12 .suffix-7,
+.container-24 .suffix-14 {
   padding-right: 560px;
 }
 
-.container-12 .suffix-8 {
+.container-16 .suffix-10,
+.container-24 .suffix-15 {
+  padding-right: 600px;
+}
+
+.container-12 .suffix-8,
+.container-24 .suffix-16 {
   padding-right: 640px;
 }
 
-.container-12 .suffix-10 {
+.container-12 .suffix-9,
+.container-16 .suffix-12,
+.container-24 .suffix-18 {
+  padding-right: 720px;
+}
+
+.container-12 .suffix-10,
+.container-24 .suffix-20 {
   padding-right: 800px;
 }
 
-.container-12 .suffix-11 {
+.container-16 .suffix-14,
+.container-24 .suffix-21 {
+  padding-right: 840px;
+}
+
+.container-12 .suffix-11,
+.container-24 .suffix-22 {
   padding-right: 880px;
 }
 
@@ -326,10 +537,6 @@
   padding-right: 60px;
 }
 
-.container-16 .suffix-2 {
-  padding-right: 120px;
-}
-
 .container-16 .suffix-3 {
   padding-right: 180px;
 }
@@ -338,10 +545,6 @@
   padding-right: 300px;
 }
 
-.container-16 .suffix-6 {
-  padding-right: 360px;
-}
-
 .container-16 .suffix-7 {
   padding-right: 420px;
 }
@@ -350,10 +553,6 @@
   padding-right: 540px;
 }
 
-.container-16 .suffix-10 {
-  padding-right: 600px;
-}
-
 .container-16 .suffix-11 {
   padding-right: 660px;
 }
@@ -362,64 +561,123 @@
   padding-right: 780px;
 }
 
-.container-16 .suffix-14 {
-  padding-right: 840px;
-}
-
 .container-16 .suffix-15 {
   padding-right: 900px;
 }
 
-/* `Push Space >> Global
+/* `Suffix Extra Space >> 24 Columns
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .push-3,
-.container-16 .push-4 {
-  left: 240px;
+.container-24 .suffix-1 {
+  padding-right: 40px;
 }
 
-.container-12 .push-6,
-.container-16 .push-8 {
-  left: 480px;
+.container-24 .suffix-3 {
+  padding-right: 120px;
 }
 
-.container-12 .push-9,
-.container-16 .push-12 {
-  left: 720px;
+.container-24 .suffix-5 {
+  padding-right: 200px;
+}
+
+.container-24 .suffix-7 {
+  padding-right: 280px;
+}
+
+.container-24 .suffix-11 {
+  padding-right: 440px;
+}
+
+.container-24 .suffix-13 {
+  padding-right: 520px;
 }
 
-/* `Push Space >> 12 Columns
+.container-24 .suffix-17 {
+  padding-right: 680px;
+}
+
+.container-24 .suffix-23 {
+  padding-right: 920px;
+}
+
+/* `Push Space >> Global
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .push-1 {
+.container-12 .push-1,
+.container-24 .push-2 {
   left: 80px;
 }
 
-.container-12 .push-2 {
+.container-16 .push-2,
+.container-24 .push-3 {
+  left: 120px;
+}
+
+.container-12 .push-2,
+.container-24 .push-4 {
   left: 160px;
 }
 
-.container-12 .push-4 {
+.container-12 .push-3,
+.container-16 .push-4,
+.container-24 .push-6 {
+  left: 240px;
+}
+
+.container-12 .push-4,
+.container-24 .push-8 {
   left: 320px;
 }
 
-.container-12 .push-5 {
+.container-16 .push-6,
+.container-24 .push-9 {
+  left: 360px;
+}
+
+.container-12 .push-5,
+.container-24 .push-10 {
   left: 400px;
 }
 
-.container-12 .push-7 {
+.container-12 .push-6,
+.container-16 .push-8,
+.container-24 .push-12 {
+  left: 480px;
+}
+
+.container-12 .push-7,
+.container-24 .push-14 {
   left: 560px;
 }
 
-.container-12 .push-8 {
+.container-16 .push-10,
+.container-24 .push-15 {
+  left: 600px;
+}
+
+.container-12 .push-8,
+.container-24 .push-16 {
   left: 640px;
 }
 
-.container-12 .push-10 {
+.container-12 .push-9,
+.container-16 .push-12,
+.container-24 .push-18 {
+  left: 720px;
+}
+
+.container-12 .push-10,
+.container-24 .push-20 {
   left: 800px;
 }
 
-.container-12 .push-11 {
+.container-16 .push-14,
+.container-24 .push-21 {
+  left: 840px;
+}
+
+.container-12 .push-11,
+.container-24 .push-22 {
   left: 880px;
 }
 
@@ -430,10 +688,6 @@
   left: 60px;
 }
 
-.container-16 .push-2 {
-  left: 120px;
-}
-
 .container-16 .push-3 {
   left: 180px;
 }
@@ -442,10 +696,6 @@
   left: 300px;
 }
 
-.container-16 .push-6 {
-  left: 360px;
-}
-
 .container-16 .push-7 {
   left: 420px;
 }
@@ -454,10 +704,6 @@
   left: 540px;
 }
 
-.container-16 .push-10 {
-  left: 600px;
-}
-
 .container-16 .push-11 {
   left: 660px;
 }
@@ -466,64 +712,127 @@
   left: 780px;
 }
 
-.container-16 .push-14 {
-  left: 840px;
-}
-
 .container-16 .push-15 {
   left: 900px;
 }
 
-/* `Pull Space >> Global
+/* `Push Space >> 24 Columns
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .pull-3,
-.container-16 .pull-4 {
-  left: -240px;
+.container-24 .push-1 {
+  left: 40px;
 }
 
-.container-12 .pull-6,
-.container-16 .pull-8 {
-  left: -480px;
+.container-24 .push-3 {
+  left: 120px;
 }
 
-.container-12 .pull-9,
-.container-16 .pull-12 {
-  left: -720px;
+.container-24 .push-5 {
+  left: 200px;
+}
+
+.container-24 .push-7 {
+  left: 280px;
 }
 
-/* `Pull Space >> 12 Columns
+.container-24 .push-9 {
+  left: 360px;
+}
+
+.container-24 .push-11 {
+  left: 440px;
+}
+
+.container-24 .push-13 {
+  left: 520px;
+}
+
+.container-24 .push-17 {
+  left: 680px;
+}
+
+.container-24 .push-23 {
+  left: 920px;
+}
+
+/* `Pull Space >> Global
 ----------------------------------------------------------------------------------------------------*/
 
-.container-12 .pull-1 {
+.container-12 .pull-1,
+.container-24 .pull-2 {
   left: -80px;
 }
 
-.container-12 .pull-2 {
+.container-16 .pull-2,
+.container-24 .pull-3 {
+  left: -120px;
+}
+
+.container-12 .pull-2,
+.container-24 .pull-4 {
   left: -160px;
 }
 
-.container-12 .pull-4 {
+.container-12 .pull-3,
+.container-16 .pull-4,
+.container-24 .pull-6 {
+  left: -240px;
+}
+
+.container-12 .pull-4,
+.container-24 .pull-8 {
   left: -320px;
 }
 
-.container-12 .pull-5 {
+.container-16 .pull-6,
+.container-24 .pull-9 {
+  left: -360px;
+}
+
+.container-12 .pull-5,
+.container-24 .pull-10 {
   left: -400px;
 }
 
-.container-12 .pull-7 {
+.container-12 .pull-6,
+.container-16 .pull-8,
+.container-24 .pull-12 {
+  left: -480px;
+}
+
+.container-12 .pull-7,
+.container-24 .pull-14 {
   left: -560px;
 }
 
-.container-12 .pull-8 {
+.container-16 .pull-10,
+.container-24 .pull-15 {
+  left: -600px;
+}
+
+.container-12 .pull-8,
+.container-24 .pull-16 {
   left: -640px;
 }
 
-.container-12 .pull-10 {
+.container-12 .pull-9,
+.container-16 .pull-12,
+.container-24 .pull-18 {
+  left: -720px;
+}
+
+.container-12 .pull-10,
+.container-24 .pull-20 {
   left: -800px;
 }
 
-.container-12 .pull-11 {
+.container-16 .pull-14,
+.container-24 .pull-21 {
+  left: -840px;
+}
+
+.container-12 .pull-11,
+.container-24 .pull-22 {
   left: -880px;
 }
 
@@ -534,10 +843,6 @@
   left: -60px;
 }
 
-.container-16 .pull-2 {
-  left: -120px;
-}
-
 .container-16 .pull-3 {
   left: -180px;
 }
@@ -546,10 +851,6 @@
   left: -300px;
 }
 
-.container-16 .pull-6 {
-  left: -360px;
-}
-
 .container-16 .pull-7 {
   left: -420px;
 }
@@ -558,10 +859,6 @@
   left: -540px;
 }
 
-.container-16 .pull-10 {
-  left: -600px;
-}
-
 .container-16 .pull-11 {
   left: -660px;
 }
@@ -570,10 +867,45 @@
   left: -780px;
 }
 
-.container-16 .pull-14 {
-  left: -840px;
-}
-
 .container-16 .pull-15 {
   left: -900px;
 }
+
+/* `Pull Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .pull-1 {
+  left: -40px;
+}
+
+.container-24 .pull-3 {
+  left: -120px;
+}
+
+.container-24 .pull-5 {
+  left: -200px;
+}
+
+.container-24 .pull-7 {
+  left: -280px;
+}
+
+.container-24 .pull-9 {
+  left: -360px;
+}
+
+.container-24 .pull-11 {
+  left: -440px;
+}
+
+.container-24 .pull-13 {
+  left: -520px;
+}
+
+.container-24 .pull-17 {
+  left: -680px;
+}
+
+.container-24 .pull-23 {
+  left: -920px;
+}