Skip to content

Commit

Permalink
Fix issue in MQ management on Sass version
Browse files Browse the repository at this point in the history
  • Loading branch information
nico3333fr committed Jan 5, 2018
1 parent 224a112 commit 690f92f
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ROCSSTI",
"version": "4.1.1",
"version": "4.1.2",
"homepage": "https://rocssti.net/en/",
"authors": [
"Nicolas HOFFMANN"
Expand Down
2 changes: 1 addition & 1 deletion dist/css/rocssti-en.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/rocssti-fr.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
8 changes: 4 additions & 4 deletions src/builder/rocssti-en.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
}



$root_default_font_size = 16;



Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions src/builder/rocssti-fr.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ function padding_generator ( $list_padding, $list_padding_values, $prefix = '',
}


$root_default_font_size = 16;



Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/sass/rocssti-en/00-config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/sass/rocssti-fr/00-config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/sass/rocssti-mobile-first-en/00-config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/sass/rocssti-mobile-first-fr/00-config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 690f92f

Please sign in to comment.