Skip to content

Commit

Permalink
update with latest converter.rb improvements
Browse files Browse the repository at this point in the history
by @glebm - thx again
  • Loading branch information
m5o committed Nov 10, 2013
1 parent febc0bc commit 5ed4420
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
20 changes: 10 additions & 10 deletions lib/_mixins.scss
Expand Up @@ -720,11 +720,11 @@
// [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
@mixin make-grid-columns() {
$list: '';
@for $i from 1 to $grid-columns {
$i: 1;
$list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
@for $i from 2 through $grid-columns {
$list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, #{$list}";
}
$i: $grid-columns;
$list: "#{$list} .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
#{$list} {
position: relative;
// Prevent columns from collapsing when empty
Expand All @@ -739,34 +739,34 @@
// [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
@mixin make-grid-columns-float($class) {
$list: '';
@for $i from 1 to $grid-columns {
$i: 1;
$list: ".col-#{$class}-#{$i}";
@for $i from 2 through $grid-columns {
$list: ".col-#{$class}-#{$i}, #{$list}";
}
$i: $grid-columns;
$list: "#{$list} .col-#{$class}-#{$i}";
#{$list} {
float: left;
}
}


@mixin calc-grid($index, $class, $type) {
@if $type == width and $index > 0 {
@if ($type == width) and ($index > 0) {
.col-#{$class}-#{$index} {
width: percentage(($index / $grid-columns));
}
}
@if $type == push {
@if ($type == push) {
.col-#{$class}-push-#{$index} {
left: percentage(($index / $grid-columns));
}
}
@if $type == pull {
@if ($type == pull) {
.col-#{$class}-pull-#{$index} {
right: percentage(($index / $grid-columns));
}
}
@if $type == offset {
@if ($type == offset) {
.col-#{$class}-offset-#{$index} {
margin-left: percentage(($index / $grid-columns));
}
Expand Down
2 changes: 2 additions & 0 deletions lib/_thumbnails.scss
Expand Up @@ -15,6 +15,8 @@
margin-right: auto;
}

// [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active

// Image captions
.caption {
padding: $thumbnail-caption-padding;
Expand Down

0 comments on commit 5ed4420

Please sign in to comment.