fixed setFloatGridColumn float grid wrong column handling

flowingis · Nov 6, 2015 · 2a11cee · 2a11cee
1 parent 21b81a4
commit 2a11cee
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 frontsize
 =========
 
-Current version [3.9.52-beta][release]
+Current version [3.9.53-beta][release]
 
 The project was [originally developed in LESS][less], but soon only the SASS version will be matained.
 
@@ -108,7 +108,7 @@ Release details
 ---
 
 **Features**
-- **fixed** float grid rules mixins to prevent rule skipping by `0` values, now can be skipped only with `false`
+- **fixed** `setFloatGridColumn` float grid wrong column handling
 
 Next release details
 ---
@@ -121,8 +121,8 @@ Next release details
 To test HTML examples:
 
 ```
-npm install && ./node_modules/.bin/bower install && php -S localhost:8000 -t ./
-open http://localhost:8000/test/html/index.html
+npm install && ./node_modules/.bin/bower install && php -S localhost:8000 -t ./test/html
+open http://localhost:8000/index.html
 ```
 
 created by [Vittorio Vittori][vitto] and [Alessandro Minoccheri][minompi], sponsored by [ideato srl][ideato]
@@ -145,4 +145,4 @@ created by [Vittorio Vittori][vitto] and [Alessandro Minoccheri][minompi], spons
 [site]:              http://frontsize.com
 [vitto]:             https://twitter.com/vttrx
 [sassdoc]:           http://sassdoc.com/
-[release]:           https://github.com/ideatosrl/frontsize-sass/releases/tag/3.9.52
+[release]:           https://github.com/ideatosrl/frontsize-sass/releases/tag/3.9.53
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "frontsize-sass",
-  "version": "3.9.52",
+  "version": "3.9.53",
   "homepage": "https://github.com/ideatosrl/frontsize-sass",
   "authors": [
     "Vittorio Vittori <[email protected]>",

diff --git a/core/core.scss b/core/core.scss
@@ -2,8 +2,8 @@
 Frontsize: http://frontsize.com
 GitHub:    https://github.com/ideatosrl/frontsize-sass
 License:   MIT Licence
-Version:   3.9.52
-Date:      2015-11-06 18:19
+Version:   3.9.53
+Date:      2015-11-06 21:22
 Authors:   Vittorio Vittori, Alessandro Minoccheri
 */
 

diff --git a/core/grids/float-grid.scss b/core/grids/float-grid.scss
@@ -1156,12 +1156,6 @@
 
     width: 100%;
 
-    $mobilePortraitStep: $mobileLandscapeStep;
-    $mobileLandscapeStep: $tabletPortraitStep;
-    $tabletPortraitStep: $tabletLandscapeStep;
-    $tabletLandscapeStep: $hdReadyStep;
-    $hdReadyStep: $hdFullStep;
-
     @include _setColumnBehavior(true, left, true, false);
 
     @include _setFloatGridColumn($from-mobile-portrait,  $mobilePortraitStep,  $totalSteps);

diff --git a/gulpfile.js b/gulpfile.js
@@ -57,7 +57,8 @@ gulp.task('frontsize:test:build', function () {
     gulp.src('test/frontsize/test.scss')
         .pipe(sass({ outputStyle: 'expanded' }).on('error', sass.logError))
         .pipe(concat('frontsize.test.css'))
-        .pipe(gulp.dest(f.path.test));
+        .pipe(gulp.dest(f.path.test))
+        .pipe(gulp.dest(f.path.css));
 });
 
 gulp.task('frontsize:test:report', function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontsize-sass",
-  "version": "3.9.52",
+  "version": "3.9.53",
   "description": "A fully customizable CSS generator to ease your life.",
   "authors": [
     {

diff --git a/test/frontsize/import.scss b/test/frontsize/import.scss
@@ -50,6 +50,9 @@
 @import "widgets/core-helpers-font";
 @import "widgets/core-helpers-sprite";
 
+@import "widgets/offset-test";
+@import "widgets/test-main";
+
 @import "widgets/button";
 
 @import "app";
diff --git a/test/frontsize/widgets/offset-test.scss b/test/frontsize/widgets/offset-test.scss
@@ -0,0 +1,20 @@
+.offset-test {
+    @include setFloatGridContainer();
+
+    @include element("left-column") {
+
+        @include setFloatGridColumn(
+            6, 6,
+            6, 6,
+            6, 6
+        );
+
+        @include setFloatGridOffset(
+            6, 6,
+            6, 6,
+            6, 6
+        );
+
+        background-color: red;
+    }
+}
diff --git a/test/frontsize/widgets/test-main.scss b/test/frontsize/widgets/test-main.scss
@@ -0,0 +1,3 @@
+.test-main {
+    padding: s();
+}
diff --git a/test/html/index.html b/test/html/index.html
@@ -6,27 +6,19 @@
     <title>Frontsize</title>
     <meta name="author" content="Vittorio Vittori">
 
-    <!-- $ ./node_modules/.bin/bower install -->
     <script src="vendor/handlebars/handlebars.min.js"></script>
     <script src="vendor/marked/marked.min.js"></script>
     <script src="vendor/include-js/include.min.js"></script>
 
-    <!-- $ ./node_modules/.bin/grunt test -->
-    <link rel="stylesheet" href="../csslint/frontsize.test.css" type="text/css">
+    <link rel="stylesheet" href="css/frontsize.test.css" type="text/css">
 
 </head>
 
 <body>
-    <main>
-        <p>
-            Add examples here<br>
-        </p>
-        <div>
-            <a class="button button--acqua" href="#">Button</a>
-        </div>
+    <main class="main">
+        <include src="partials/grids/offset.html"></include>
     </main>
     <!-- <include src="template/header.html"></include>
-    <include src="template/content.html"></include>
     <include src="template/footer.html"></include> -->
     <script type="text/javascript">
         Include.onLoad = function() {

diff --git a/test/html/partials/grids/offset.html b/test/html/partials/grids/offset.html
@@ -0,0 +1,5 @@
+<div class="offset-test">
+    <div class="offset-test__left-column">
+        test
+    </div>
+</div>