Moved IE-specific grid properties to ie.css

Return of .column and removed div from .span-x Bugfixes
kellit · Oct 29, 2008 · 679d449 · 679d449
1 parent 0d4be49
commit 679d449
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 38 deletions.
diff --git a/blueprint/ie.css b/blueprint/ie.css
@@ -1,7 +1,8 @@
 /* -----------------------------------------------------------------------
 
-   Blueprint CSS Framework 0.7.1
-   http://blueprintcss.googlecode.com
+
+ Blueprint CSS Framework 0.7.1
+ http://blueprintcss.googlecode.com
 
    * Copyright (c) 2007-2008. See LICENSE for more info.
    * See README for instructions on how to use Blueprint.
@@ -19,4 +20,6 @@ ol {margin-left:2em;}
 sup {vertical-align:text-top;}
 sub {vertical-align:text-bottom;}
 html>body p code {*white-space:normal;}
-hr {margin:-8px auto 11px;}
+hr {margin:-8px auto 11px;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
diff --git a/blueprint/print.css b/blueprint/print.css
@@ -1,7 +1,8 @@
 /* -----------------------------------------------------------------------
 
-   Blueprint CSS Framework 0.7.1
-   http://blueprintcss.googlecode.com
+
+ Blueprint CSS Framework 0.7.1
+ http://blueprintcss.googlecode.com
 
    * Copyright (c) 2007-2008. See LICENSE for more info.
    * See README for instructions on how to use Blueprint.

diff --git a/blueprint/screen.css b/blueprint/screen.css
@@ -1,7 +1,8 @@
 /* -----------------------------------------------------------------------
 
-   Blueprint CSS Framework 0.7.1
-   http://blueprintcss.googlecode.com
+
+ Blueprint CSS Framework 0.7.1
+ http://blueprintcss.googlecode.com
 
    * Copyright (c) 2007-2008. See LICENSE for more info.
    * See README for instructions on how to use Blueprint.
@@ -43,7 +44,7 @@ sup, sub {line-height:0;}
 abbr, acronym {border-bottom:1px dotted #666;}
 address {margin:0 0 1.5em;font-style:italic;}
 del {color:#666;}
-pre, code {margin:1.5em 0;white-space:pre;}
+pre {margin:1.5em 0;white-space:pre;}
 pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
 li ul, li ol {margin:0 1.5em;}
 ul, ol {margin:0 1.5em 1.5em 1.5em;}
@@ -76,8 +77,8 @@ caption {background:#eee;}
 .showgrid {background:url(src/grid.png);}
 body {margin:1.5em 0;}
 div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;}
-div.last {margin-right:0;}
-.span-1 {width:30px;}
+.last {margin-right:0;}
+.column, .span-1 {width:30px;}
 .span-2 {width:70px;}
 .span-3 {width:110px;}
 .span-4 {width:150px;}
@@ -101,6 +102,30 @@ div.last {margin-right:0;}
 .span-22 {width:870px;}
 .span-23 {width:910px;}
 .span-24, div.span-24 {width:950px;margin:0;}
+input.span-1, textarea.span-1, select.span-1 {width:30px!important;}
+input.span-2, textarea.span-2, select.span-2 {width:50px!important;}
+input.span-3, textarea.span-3, select.span-3 {width:90px!important;}
+input.span-4, textarea.span-4, select.span-4 {width:130px!important;}
+input.span-5, textarea.span-5, select.span-5 {width:170px!important;}
+input.span-6, textarea.span-6, select.span-6 {width:210px!important;}
+input.span-7, textarea.span-7, select.span-7 {width:250px!important;}
+input.span-8, textarea.span-8, select.span-8 {width:290px!important;}
+input.span-9, textarea.span-9, select.span-9 {width:330px!important;}
+input.span-10, textarea.span-10, select.span-10 {width:370px!important;}
+input.span-11, textarea.span-11, select.span-11 {width:410px!important;}
+input.span-12, textarea.span-12, select.span-12 {width:450px!important;}
+input.span-13, textarea.span-13, select.span-13 {width:490px!important;}
+input.span-14, textarea.span-14, select.span-14 {width:530px!important;}
+input.span-15, textarea.span-15, select.span-15 {width:570px!important;}
+input.span-16, textarea.span-16, select.span-16 {width:610px!important;}
+input.span-17, textarea.span-17, select.span-17 {width:650px!important;}
+input.span-18, textarea.span-18, select.span-18 {width:690px!important;}
+input.span-19, textarea.span-19, select.span-19 {width:730px!important;}
+input.span-20, textarea.span-20, select.span-20 {width:770px!important;}
+input.span-21, textarea.span-21, select.span-21 {width:810px!important;}
+input.span-22, textarea.span-22, select.span-22 {width:850px!important;}
+input.span-23, textarea.span-23, select.span-23 {width:890px!important;}
+input.span-24, textarea.span-24, select.span-24 {width:940px!important;}
 .append-1 {padding-right:40px;}
 .append-2 {padding-right:80px;}
 .append-3 {padding-right:120px;}
@@ -203,8 +228,6 @@ div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;
 hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
 hr.space {background:#fff;color:#fff;}
 .clearfix:after, .container:after {content:".";display:block;height:0;clear:both;visibility:hidden;}
-.clearfix, .container {display:inline-block;}
-* html .clearfix, * html .container {height:1%;}
 .clearfix, .container {display:block;}
 .clear {clear:both;}
 

diff --git a/blueprint/src/grid.css b/blueprint/src/grid.css
@@ -20,7 +20,7 @@
   margin: 0 auto;
 }
 
-/* Use this class on any div.span / container to see the grid. */
+/* Use this class on any .span / container to see the grid. */
 .showgrid { background: url(src/grid.png);  }
 
 /* Body margin for a sensible default look. */
@@ -31,17 +31,17 @@ body { margin:1.5em 0; }
 -------------------------------------------------------------- */
 
 /* Sets up basic grid floating and margin. */
-div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, 
-div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, 
-div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, 
-div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, 
-div.span-21, div.span-22, div.span-23, div.span-24 {
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, 
+.span-6, .span-7, .span-8, .span-9, .span-10, 
+.span-11, .span-12, .span-13, .span-14, .span-15, 
+.span-16, .span-17, .span-18, .span-19, .span-20, 
+.span-21, .span-22, .span-23, .span-24 {
   float: left;
   margin-right: 10px; 
 }
 
 /* The last column in a row needs this class. */
-div.last { margin-right: 0; }
+.last { margin-right: 0; }
 
 /* Use these classes to set the width of a column. */
 .span-1  { width: 30px; }
@@ -67,7 +67,7 @@ div.last { margin-right: 0; }
 .span-21 { width: 830px; }
 .span-22 { width: 870px; }
 .span-23 { width: 910px; }
-.span-24, div.span-24 { width: 950px; margin: 0; }
+.span-24 { width: 950px; margin: 0; }
 
 /* Add these to a column to append empty cols. */
 .append-1  { padding-right: 40px; }  
@@ -121,14 +121,14 @@ div.last { margin-right: 0; }
 
 
 /* Border on right hand side of a column. */
-div.border {
+.border {
   padding-right: 4px;
   margin-right: 5px;
   border-right: 1px solid #eee;
 }
 
 /* Border with more whitespace, spans one column. */
-div.colborder {
+.colborder {
   padding-right: 24px;
   margin-right: 25px;
   border-right: 1px solid #eee;
@@ -144,8 +144,7 @@ div.colborder {
 .pull-4 { margin-left: -160px; }
 .pull-5 { margin-left: -200px; }
 
-.pull-1, .pull-2, .pull-3, 
-.pull-4, .pull-5, .pull-5 {
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5 {
   float:left;
 	position:relative;
 }
@@ -156,8 +155,7 @@ div.colborder {
 .push-4 { margin: 0 -160px 1.5em 160px; }
 .push-5 { margin: 0 -200px 1.5em 200px; }
 
-.push-0, .push-1, .push-2, 
-.push-3, .push-4, .push-5 { 
+.push-1, .push-2, .push-3, .push-4, .push-5 { 
   float: right;
 	position:relative;
 }
@@ -201,9 +199,6 @@ hr.space {
     clear: both; 
     visibility: hidden;
 }
-.clearfix, .container {display: inline-block;}
-* html .clearfix,
-* html .container {height: 1%;}
 .clearfix, .container {display: block;}
 
 /* Regular clearing

diff --git a/blueprint/src/ie.css b/blueprint/src/ie.css
@@ -33,3 +33,12 @@ html>body p code { *white-space: normal; }
 
 /* IE 6&7 has problems with setting proper <hr> margins. */
 hr  { margin: -8px auto 11px; }
+
+
+/* Clearing 
+-------------------------------------------------------------- */
+
+/* Makes clearfix actually work in IE */ 
+.clearfix, .container {display: inline-block;}
+* html .clearfix,
+* html .container {height: 1%;}
diff --git a/blueprint/src/typography.css b/blueprint/src/typography.css
@@ -2,7 +2,7 @@
    
    typography.css
    * Sets up some sensible default typography.
-      
+   
 -------------------------------------------------------------- */
 
 /* Default font settings. 
@@ -55,8 +55,8 @@ acronym     { border-bottom: 1px dotted #666; }
 address     { margin: 0 0 1.5em; font-style: italic; }
 del         { color:#666; }
 
-pre,code    { margin: 1.5em 0; white-space: pre; }
-pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; } 
+pre 				{ margin: 1.5em 0; white-space: pre; }
+pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
 
 
 /* Lists

diff --git a/lib/blueprint/grid.css.erb b/lib/blueprint/grid.css.erb
@@ -29,16 +29,16 @@ body {
 }
 
 /* The last column in a row needs this class. */
-div.last { margin-right: 0; }
+.last { margin-right: 0; }
 
 /* Use these classes to set the width of a column. */
-.span-1 {width: <%= column_width %>px;}
+.column, .span-1 {width: <%= column_width %>px;}
 <% (2..column_count-1).each do |column| %>
   .span-<%= column %> {width: <%= (column_width + ((column - 1) * (column_width + gutter_width))).to_i %>px;<%= "margin: 0;" if column == column_count %>}
 <% end %>
 .span-<%= column_count %>, div.span-<%= column_count %> { width:<%= page_width %>px; margin:0; }
 
-/* Use these classes to set the width of a input. */
+/* Use these classes to set the width of an input. */
 input.span-1, textarea.span-1, select.span-1 {width: <%= column_width %>px!important;}
 <% (2..column_count-1).each do |column| %>
   input.span-<%= column %>, textarea.span-<%= column %>, select.span-<%= column %> {width: <%= (column_width - 10 - gutter_width + ((column - 1) * (column_width + gutter_width))).to_i %>px!important;<%= "margin: 0;" if column == column_count %>}
@@ -125,9 +125,6 @@ hr.space {
     clear: both; 
     visibility: hidden;
 }
-.clearfix, .container {display: inline-block;}
-* html .clearfix,
-* html .container {height: 1%;}
 .clearfix, .container {display: block;}
 
 /* Regular clearing