From 690f92f966565f2995861afaf9ccfbf59dd1cbc1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-0LNRR0O\\Nico" <dante3333@gmail.com>
Date: Fri, 5 Jan 2018 15:17:41 +0100
Subject: [PATCH] Fix issue in MQ management on Sass version

---
 bower.json                                      | 2 +-
 dist/css/rocssti-en.min.css                     | 2 +-
 dist/css/rocssti-fr.min.css                     | 2 +-
 package.json                                    | 2 +-
 src/builder/rocssti-en.php                      | 8 ++++----
 src/builder/rocssti-fr.php                      | 7 ++++---
 src/sass/rocssti-en/00-config.scss              | 4 ++--
 src/sass/rocssti-fr/00-config.scss              | 4 ++--
 src/sass/rocssti-mobile-first-en/00-config.scss | 4 ++--
 src/sass/rocssti-mobile-first-fr/00-config.scss | 4 ++--
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/bower.json b/bower.json
index 9cfd81bf..4e05ecd9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ROCSSTI",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "homepage": "https://rocssti.net/en/",
   "authors": [
     "Nicolas HOFFMANN"
diff --git a/dist/css/rocssti-en.min.css b/dist/css/rocssti-en.min.css
index 1c8789be..5f6422cf 100644
--- a/dist/css/rocssti-en.min.css
+++ b/dist/css/rocssti-en.min.css
@@ -1,6 +1,6 @@
 /**
  * ROCSSTI - Röcssti is a lightweight, extensible and responsive CSS to start your projects. This CSS micro-framework is especially designed for starting responsive websites. LESS and Sass versions are also available, with a mobile-first version for Sass.
- * @version v4.1.1
+ * @version v4.1.2
  * @link https://rocssti.net/en/
  * @license MIT : https://github.com/nico3333fr/ROCSSTI/blob/master/LICENSE
  */
diff --git a/dist/css/rocssti-fr.min.css b/dist/css/rocssti-fr.min.css
index 0680bc2c..b9589a78 100644
--- a/dist/css/rocssti-fr.min.css
+++ b/dist/css/rocssti-fr.min.css
@@ -1,6 +1,6 @@
 /**
  * ROCSSTI - Röcssti est un micro-framework léger, extensible et responsive pour vos projets. Il est conçu spécialement pour produire rapidement des sites responsive. Des versions LESS et Sass sont aussi disponibles, avec une version mobile-first pour Sass.
- * @version v4.1.1
+ * @version v4.1.2
  * @link https://rocssti.net/
  * @license MIT : https://github.com/nico3333fr/ROCSSTI/blob/master/LICENSE
  */
diff --git a/package.json b/package.json
index 12d2ec37..e22ecfe9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "title": "Röcssti is a lightweight CSS microframework to start your responsive projects",
   "name": "rocssti",
   "description": "Röcssti is a lightweight, extensible and responsive CSS to start your projects. This CSS micro-framework is especially designed for starting responsive websites. LESS and Sass versions are also available, with a mobile-first version for Sass.",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "keywords": [
     "css", "rocssti", "micro-framework", "framework", "reset", "responsive", "rwd", "boilerplate", "workflow", "sass", "less"
   ],
diff --git a/src/builder/rocssti-en.php b/src/builder/rocssti-en.php
index feb7d80a..5cc9de60 100644
--- a/src/builder/rocssti-en.php
+++ b/src/builder/rocssti-en.php
@@ -299,7 +299,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
 }
 
 
-
+$root_default_font_size = 16;
 
 
 
@@ -1610,7 +1610,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */ 
 
-@media (max-width: '. ($breakpoint_tablet/16) .'em) { /* equiv '.$breakpoint_tablet.'px */
+@media (max-width: '. ($breakpoint_tablet/$root_default_font_size) .'em) { /* equiv '.$breakpoint_tablet.'px */
    
   /**
    * layout/modules
@@ -1707,7 +1707,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */
 
-@media (max-width: '. ($breakpoint_mobile/16) .'em) { /* equiv '.$breakpoint_mobile.'px */
+@media (max-width: '. ($breakpoint_mobile/$root_default_font_size) .'em) { /* equiv '.$breakpoint_mobile.'px */
 
   /**
    * layout/modules
@@ -1789,7 +1789,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */
 
-@media (max-width: '. ($breakpoint_tinymobile/16) .'em) { /* equiv '.$breakpoint_tinymobile.'px */
+@media (max-width: '. ($breakpoint_tinymobile/$root_default_font_size) .'em) { /* equiv '.$breakpoint_tinymobile.'px */
 
   /**
    * layout/modules
diff --git a/src/builder/rocssti-fr.php b/src/builder/rocssti-fr.php
index e4463e12..f2b01f2a 100644
--- a/src/builder/rocssti-fr.php
+++ b/src/builder/rocssti-fr.php
@@ -299,6 +299,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
 }
 
 
+$root_default_font_size = 16;
 
 
 
@@ -1614,7 +1615,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */ 
 
-@media (max-width: '. ($breakpoint_tablet/16) .'em) { /* equiv '.$breakpoint_tablet.'px */
+@media (max-width: '. ($breakpoint_tablet/$root_default_font_size) .'em) { /* equiv '.$breakpoint_tablet.'px */
    
   /**
    * layout/modules
@@ -1710,7 +1711,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */
 
-@media (max-width: '. ($breakpoint_mobile/16) .'em) { /* equiv '.$breakpoint_mobile.'px */
+@media (max-width: '. ($breakpoint_mobile/$root_default_font_size) .'em) { /* equiv '.$breakpoint_mobile.'px */
 
   /**
    * layout/modules
@@ -1792,7 +1793,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
  *****************************************************************
  */
 
-@media (max-width: '. ($breakpoint_tinymobile/16) .'em) { /* equiv '.$breakpoint_tinymobile.'px */
+@media (max-width: '. ($breakpoint_tinymobile/$root_default_font_size) .'em) { /* equiv '.$breakpoint_tinymobile.'px */
 
   /**
    * layout/modules
diff --git a/src/sass/rocssti-en/00-config.scss b/src/sass/rocssti-en/00-config.scss
index c67c32b0..e29d248e 100644
--- a/src/sass/rocssti-en/00-config.scss
+++ b/src/sass/rocssti-en/00-config.scss
@@ -308,13 +308,13 @@ $use-old-ie-fallbacks  : true !default;
 
 @mixin respond-to ($breakpoint, $query-type : 'max') {
   @if $query-type == "max" {
-     @media (max-width: em($breakpoint)) {
+     @media (max-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
  
   @else if $query-type == "min" {
-     @media (min-width: em($breakpoint)) {
+     @media (min-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
diff --git a/src/sass/rocssti-fr/00-config.scss b/src/sass/rocssti-fr/00-config.scss
index 4a80e3e3..bdc54731 100644
--- a/src/sass/rocssti-fr/00-config.scss
+++ b/src/sass/rocssti-fr/00-config.scss
@@ -307,13 +307,13 @@ $use-old-ie-fallbacks  : true !default;
 
 @mixin respond-to ($breakpoint, $query-type : 'max') {
   @if $query-type == "max" {
-     @media (max-width: em($breakpoint)) {
+     @media (max-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
  
   @else if $query-type == "min" {
-     @media (min-width: em($breakpoint)) {
+     @media (min-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
diff --git a/src/sass/rocssti-mobile-first-en/00-config.scss b/src/sass/rocssti-mobile-first-en/00-config.scss
index feee5257..b5c4a319 100644
--- a/src/sass/rocssti-mobile-first-en/00-config.scss
+++ b/src/sass/rocssti-mobile-first-en/00-config.scss
@@ -306,13 +306,13 @@ $use-old-ie-fallbacks  : true !default;
 
 @mixin respond-to ($breakpoint, $query-type : 'min') {
   @if $query-type == "max" {
-     @media (max-width: em($breakpoint)) {
+     @media (max-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
 
   @else if $query-type == "min" {
-     @media (min-width: em($breakpoint)) {
+     @media (min-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
diff --git a/src/sass/rocssti-mobile-first-fr/00-config.scss b/src/sass/rocssti-mobile-first-fr/00-config.scss
index 2b363a71..a19b7789 100644
--- a/src/sass/rocssti-mobile-first-fr/00-config.scss
+++ b/src/sass/rocssti-mobile-first-fr/00-config.scss
@@ -306,13 +306,13 @@ $use-old-ie-fallbacks  : true !default;
 
 @mixin respond-to ($breakpoint, $query-type : 'min') {
   @if $query-type == "max" {
-     @media (max-width: em($breakpoint)) {
+     @media (max-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }
  
   @else if $query-type == "min" {
-     @media (min-width: em($breakpoint)) {
+     @media (min-width: em($breakpoint, $root-default-font-size)) {
       @content;
     }
   }