Browse files

Make .colborder and .border not div-specific

  • Loading branch information...
1 parent 6a3f2f8 commit 63b66d722bb727dac6be949b8cef74b913662bd5 @joshuaclayton joshuaclayton committed Jan 16, 2010
Showing with 8 additions and 8 deletions.
  1. +2 −2 blueprint/screen.css
  2. +3 −3 blueprint/src/grid.css
  3. BIN blueprint/src/grid.png
  4. +3 −3 lib/blueprint/grid.css.erb
View
4 blueprint/screen.css
@@ -196,8 +196,8 @@ input.span-24, textarea.span-24 {width:938px!important;}
.prepend-21 {padding-left:840px;}
.prepend-22 {padding-left:880px;}
.prepend-23 {padding-left:920px;}
-div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;}
-div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;}
+.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;}
+.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;}
.pull-1 {margin-left:-40px;}
.pull-2 {margin-left:-80px;}
.pull-3 {margin-left:-120px;}
View
6 blueprint/src/grid.css
@@ -17,7 +17,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);
}
@@ -149,14 +149,14 @@ input.span-24, textarea.span-24 { width: 938px!important; }
/* 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;
View
BIN blueprint/src/grid.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 lib/blueprint/grid.css.erb
@@ -17,7 +17,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);
}
@@ -61,14 +61,14 @@ input.span-<%= column %>, textarea.span-<%= column %> { width: <%= ((column_widt
/* Border on right hand side of a column. */
-div.border {
+.border {
padding-right: <%= (gutter_width * 0.5 - 1).to_i %>px;
margin-right: <%= (gutter_width * 0.5).to_i %>px;
border-right: 1px solid #eee;
}
/* Border with more whitespace, spans one column. */
-div.colborder {
+.colborder {
padding-right: <%= (column_width + 2*gutter_width - 1)/2.to_i %>px;
margin-right: <%= (column_width + 2 * gutter_width)/2.to_i %>px;
border-right: 1px solid #eee;

0 comments on commit 63b66d7

Please sign in to comment.