Skip to content

Commit

Permalink
Disable option for floating grids
Browse files Browse the repository at this point in the history
  • Loading branch information
bcinarli committed Jan 26, 2017
1 parent f75a730 commit baab26b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Melange Change Log
## Versiyon 0.7.1
- CHANGE: Now you can disable oldschool floating columns by defining `$base-grid-columns: 0`

## Version 0.7.0
- NEW: sass-lint added for better standardization
- NEW: `%melange-*` placeholders added for most of the melange default classes.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "melange",
"version": "0.7.0",
"version": "0.7.1",
"homepage": "https://github.com/bcinarli/melange",
"authors": [
"Bilal Çınarlı <[email protected]>"
Expand Down
8 changes: 4 additions & 4 deletions lib/melange/layout/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
margin-left: -$base-gutter;
}

@if ($predefined-classes) {
@if ($predefined-classes and $base-grid-columns > 0) {
.#{$namespace}#{$row-name} {
&::after {
display: table;
Expand Down Expand Up @@ -127,7 +127,7 @@
@extend %melange-line-end;
}

@if ($predefined-classes) {
@if ($predefined-classes and $base-grid-columns > 0) {
.#{$column-name} {
@extend %melange-column;
}
Expand All @@ -151,14 +151,14 @@
* @see melange/variables/_sizes.scss
* @see settings/_sizes.scss
*/
@if ($predefined-classes) {
@if ($predefined-classes and $base-grid-columns > 0) {
@include grid-columns;
}

/**
* Offsets
* Sets the offsets classes according to column number defined in $base-grid-columns
*/
@if ($predefined-classes) {
@if ($predefined-classes and $base-grid-columns > 0) {
@include offset;
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "melange",
"version": "0.7.0",
"version": "0.7.1",
"description": "A low level SASS based CSS framework for general usage",
"repository": {
"type": "git",
Expand Down

0 comments on commit baab26b

Please sign in to comment.