diff --git a/changelog.md b/changelog.md index 4c8454d..457ee3e 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ - corrections typo - support passé de IE10 à IE11 (browserlist) +- renommage de dossiers à la "7-1 pattern": `_config` > `abstracts`, `_library` > `base`, et du fichier `_base.scss` en `_reset.scss` ## Changelog v7.1.2 (30 janvier 2019) diff --git a/sass/_config/_mixins.scss b/sass/abstracts/_mixins.scss similarity index 100% rename from sass/_config/_mixins.scss rename to sass/abstracts/_mixins.scss diff --git a/sass/_config/_variables.scss b/sass/abstracts/_variables.scss similarity index 100% rename from sass/_config/_variables.scss rename to sass/abstracts/_variables.scss diff --git a/sass/_library/_layout.scss b/sass/base/_layout.scss similarity index 100% rename from sass/_library/_layout.scss rename to sass/base/_layout.scss diff --git a/sass/_library/_print.scss b/sass/base/_print.scss similarity index 100% rename from sass/_library/_print.scss rename to sass/base/_print.scss diff --git a/sass/_library/_base.scss b/sass/base/_reset.scss similarity index 97% rename from sass/_library/_base.scss rename to sass/base/_reset.scss index 3c9152e..3259431 100644 --- a/sass/_library/_base.scss +++ b/sass/base/_reset.scss @@ -26,13 +26,12 @@ html { html { /* set base font-size to equiv "10px", which is adapted to rem unit */ - font-size: 62.5%; - /* IE9-IE11 math fixing. See http://bit.ly/1g4X0bX */ font-size: calc(1em * 0.625); } body { margin: 0; + padding: 0; @include font-size(base); background-color: $background-base; color: $color-base; diff --git a/sass/_library/_responsive.scss b/sass/base/_responsive.scss similarity index 100% rename from sass/_library/_responsive.scss rename to sass/base/_responsive.scss diff --git a/sass/_library/_utilities.scss b/sass/base/_utilities.scss similarity index 100% rename from sass/_library/_utilities.scss rename to sass/base/_utilities.scss diff --git a/sass/_library/_wordpress.scss b/sass/base/_wordpress.scss similarity index 100% rename from sass/_library/_wordpress.scss rename to sass/base/_wordpress.scss diff --git a/sass/_library/grillade-flex.scss b/sass/base/grillade-flex.scss similarity index 100% rename from sass/_library/grillade-flex.scss rename to sass/base/grillade-flex.scss diff --git a/sass/_library/grillade-grid.scss b/sass/base/grillade-grid.scss similarity index 100% rename from sass/_library/grillade-grid.scss rename to sass/base/grillade-grid.scss diff --git a/sass/knacss.scss b/sass/knacss.scss index e103caf..f94f1b5 100644 --- a/sass/knacss.scss +++ b/sass/knacss.scss @@ -9,8 +9,8 @@ /* 1- Reboot (basic reset) -2- Libraries : - - Base +2- Base : + - Reset - Print - Layout (alignment, modules, positionning) - Utilities (width and spacers helpers) @@ -30,25 +30,25 @@ - Alerts */ -@import "_vendor/reboot"; // Bootstrap reboot (basic reset) (CSS file renamed and imported as if it was a partial because of libsass) +@import "vendor/reboot"; // Bootstrap reboot (basic reset) (CSS file renamed and imported as if it was a partial because of libsass) // WARNING : you should comment the following @import (variables) // and move variables file from knacss folder to your own project folder! -@import "_config/variables"; +@import "abstracts/variables"; -@import "_config/mixins"; +@import "abstracts/mixins"; // Core Libraries -@import "_library/base"; // basic styles -@import "_library/print"; // print quick reset -@import "_library/layout"; // alignment, modules, positionning -@import "_library/utilities"; // width and spacer helpers -@import "_library/responsive"; // Responsive Web Design helpers -// @import "_library/wordpress"; // WordPress reset and basic styles +@import "base/reset"; // basic styles +@import "base/print"; // print quick reset +@import "base/layout"; // alignment, modules, positionning +@import "base/utilities"; // width and spacer helpers +@import "base/responsive"; // Responsive Web Design helpers +// @import "base/wordpress"; // WordPress reset and basic styles -// New Grid System by default (Grid Layout). If you prefer old "Flexbox" Grid System, replace file with "_library/grillade-flex" +// New Grid System by default (Grid Layout). If you prefer old "Flexbox" Grid System, replace file with "base/grillade-flex" // Note that none of these files are prefixed by an underscore, in order to compile them. -@import "_library/grillade-grid"; // grid system with Grid Layout +@import "base/grillade-grid"; // grid system with Grid Layout // Components @import "components/media"; // media object diff --git a/sass/_vendor/_reboot.scss b/sass/vendor/_reboot.scss similarity index 100% rename from sass/_vendor/_reboot.scss rename to sass/vendor/_reboot.scss