Skip to content

Commit

Permalink
Added block.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob VanderClay authored and Bob VanderClay committed Oct 2, 2012
1 parent 462a2eb commit 1fe487c
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions stylesheets/takitapart_framework/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ $total-columns: $columns;
@return ($total-width / $total-columns) * $columns;
}


// The micro clearfix http://nicolasgallagher.com/micro-clearfix-hack/
@mixin clearfix() {
*zoom:1;
Expand Down Expand Up @@ -48,7 +47,7 @@ $total-columns: $columns;
box-sizing: border-box;
}

// Row is a container for nested columns
// Subgrid is a container for nested columns
@mixin subgrid($columns:$columns,$of-columns:$total-columns) {
display: block;
float: left;
Expand Down Expand Up @@ -77,11 +76,31 @@ $total-columns: $columns;
box-sizing: border-box;
}

@mixin push($columns:1,$of-columns:$total-columns) {
@mixin push($columns: 1, $of-columns: $total-columns) {
margin-left: gridsystem-width($columns,$of-columns);

}

@mixin pull($columns:1,$of-columns:$total-columns) {
@mixin pull($columns: 1, $of-columns: $total-columns) {
margin-right: gridsystem-width($columns,$of-columns);
}

@mixin block($width-in-cols: 1, $height-in-cols: $width-in-cols, $padding: 0) {

display: inline-block;
position: relative;

@include column($width-in-cols);
padding-bottom: gridsystem-width($height-in-cols);

& > * {
position: absolute;
overflow: hidden;

top: $padding;
bottom: $padding;
left: $padding;
right: $padding;
}

}

0 comments on commit 1fe487c

Please sign in to comment.