@import interdit dans un @if...

This commit is contained in:
Raphael 2019-07-19 11:14:35 +02:00
parent 75644329fd
commit e71db133ec
4 changed files with 56 additions and 54 deletions

View file

@ -4,10 +4,9 @@
- mise à jour du reset, suppression des reset vendors (reboot) - mise à jour du reset, suppression des reset vendors (reboot)
- support passé de IE10 à IE11 (browserlist) - support passé de IE10 à IE11 (browserlist)
- ajout d'une variable pour supporter ou non IE11 : `$ie: true !default;`. Activation de Grid Layout ou flexbox selon cette variable - ajout d'une variable pour supporter ou non IE11 : `$ie: true !default;`.
- ajout d'une variable pour supporter ou non les classes utilitaires : `$utilities: true !default;`. - ajout d'une variable pour supporter ou non WordPress : `$wordpress: false !default;`.
- ajout d'une variable pour supporter ou non WordPress : `$wordpress: false !default;`. Activation de reset et styles WordPress selon cette variable - renommage des classes `grid-` en `grillade-` pour éviter tout conflit
- renommage les classes `grid-` en `grillade-` pour éviter tout conflit
- renommage de dossiers à la "7-1 pattern": `_config` > `abstracts`, `_library` > `base`, et du fichier `_base.scss` en `_reset.scss` - renommage de dossiers à la "7-1 pattern": `_config` > `abstracts`, `_library` > `base`, et du fichier `_base.scss` en `_reset.scss`
- Browserslist devenu `.browserslistrc` - Browserslist devenu `.browserslistrc`
- corrections typo - corrections typo

View file

@ -543,6 +543,21 @@ figure {
margin-right: 0; margin-right: 0;
} }
@media (max-width: 575px) {
body,
div,
textarea,
table,
td,
th,
code,
pre,
samp {
word-wrap: break-word;
overflow-wrap: break-word;
}
}
/* ----------------------------- */ /* ----------------------------- */
/* ==Reset (IE rules) */ /* ==Reset (IE rules) */
/* ----------------------------- */ /* ----------------------------- */
@ -1559,99 +1574,99 @@ ul.is-unstyled, ul.unstyled {
/* ==Grillade : ultra light Grid System */ /* ==Grillade : ultra light Grid System */
/* --------------------------------------- */ /* --------------------------------------- */
@media (min-width: 480px) { @media (min-width: 480px) {
[class*=" grid-"], [class*=" grillade-"],
[class^="grid-"] { [class^="grillade-"] {
display: -ms-grid; display: -ms-grid;
display: grid; display: grid;
grid-auto-flow: dense; grid-auto-flow: dense;
} }
[class*=" grid-"].has-gutter, [class*=" grillade-"].has-gutter,
[class^="grid-"].has-gutter { [class^="grillade-"].has-gutter {
grid-gap: 1rem; grid-gap: 1rem;
} }
[class*=" grid-"].has-gutter-l, [class*=" grillade-"].has-gutter-l,
[class^="grid-"].has-gutter-l { [class^="grillade-"].has-gutter-l {
grid-gap: 2rem; grid-gap: 2rem;
} }
[class*=" grid-"].has-gutter-xl, [class*=" grillade-"].has-gutter-xl,
[class^="grid-"].has-gutter-xl { [class^="grillade-"].has-gutter-xl {
grid-gap: 4rem; grid-gap: 4rem;
} }
} }
@media (min-width: 480px) { @media (min-width: 480px) {
.autogrid, .autogrillade,
.grid { .grillade {
display: -ms-grid; display: -ms-grid;
display: grid; display: grid;
grid-auto-flow: column; grid-auto-flow: column;
grid-auto-columns: 1fr; grid-auto-columns: 1fr;
} }
.autogrid.has-gutter, .autogrillade.has-gutter,
.grid.has-gutter { .grillade.has-gutter {
grid-column-gap: 1rem; grid-column-gap: 1rem;
} }
.autogrid.has-gutter-l, .autogrillade.has-gutter-l,
.grid.has-gutter-l { .grillade.has-gutter-l {
grid-column-gap: 2rem; grid-column-gap: 2rem;
} }
.autogrid.has-gutter-xl, .autogrillade.has-gutter-xl,
.grid.has-gutter-xl { .grillade.has-gutter-xl {
grid-column-gap: 4rem; grid-column-gap: 4rem;
} }
} }
[class*="grid-2"] { [class*="grillade-2"] {
-ms-grid-columns: (1fr)[2]; -ms-grid-columns: (1fr)[2];
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
} }
[class*="grid-3"] { [class*="grillade-3"] {
-ms-grid-columns: (1fr)[3]; -ms-grid-columns: (1fr)[3];
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
} }
[class*="grid-4"] { [class*="grillade-4"] {
-ms-grid-columns: (1fr)[4]; -ms-grid-columns: (1fr)[4];
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
} }
[class*="grid-5"] { [class*="grillade-5"] {
-ms-grid-columns: (1fr)[5]; -ms-grid-columns: (1fr)[5];
grid-template-columns: repeat(5, 1fr); grid-template-columns: repeat(5, 1fr);
} }
[class*="grid-6"] { [class*="grillade-6"] {
-ms-grid-columns: (1fr)[6]; -ms-grid-columns: (1fr)[6];
grid-template-columns: repeat(6, 1fr); grid-template-columns: repeat(6, 1fr);
} }
[class*="grid-7"] { [class*="grillade-7"] {
-ms-grid-columns: (1fr)[7]; -ms-grid-columns: (1fr)[7];
grid-template-columns: repeat(7, 1fr); grid-template-columns: repeat(7, 1fr);
} }
[class*="grid-8"] { [class*="grillade-8"] {
-ms-grid-columns: (1fr)[8]; -ms-grid-columns: (1fr)[8];
grid-template-columns: repeat(8, 1fr); grid-template-columns: repeat(8, 1fr);
} }
[class*="grid-9"] { [class*="grillade-9"] {
-ms-grid-columns: (1fr)[9]; -ms-grid-columns: (1fr)[9];
grid-template-columns: repeat(9, 1fr); grid-template-columns: repeat(9, 1fr);
} }
[class*="grid-10"] { [class*="grillade-10"] {
-ms-grid-columns: (1fr)[10]; -ms-grid-columns: (1fr)[10];
grid-template-columns: repeat(10, 1fr); grid-template-columns: repeat(10, 1fr);
} }
[class*="grid-11"] { [class*="grillade-11"] {
-ms-grid-columns: (1fr)[11]; -ms-grid-columns: (1fr)[11];
grid-template-columns: repeat(11, 1fr); grid-template-columns: repeat(11, 1fr);
} }
[class*="grid-12"] { [class*="grillade-12"] {
-ms-grid-columns: (1fr)[12]; -ms-grid-columns: (1fr)[12];
grid-template-columns: repeat(12, 1fr); grid-template-columns: repeat(12, 1fr);
} }
@ -1754,28 +1769,28 @@ ul.is-unstyled, ul.unstyled {
/* intermediate breakpoints */ /* intermediate breakpoints */
@media (min-width: 480px) and (max-width: 767px) { @media (min-width: 480px) and (max-width: 767px) {
[class*="grid-"][class*="-small-1"] { [class*="grillade-"][class*="-small-1"] {
-ms-grid-columns: (1fr)[1]; -ms-grid-columns: (1fr)[1];
grid-template-columns: repeat(1, 1fr); grid-template-columns: repeat(1, 1fr);
} }
[class*="col-"][class*="-small-1"] { [class*="col-"][class*="-small-1"] {
grid-column: auto/span 1; grid-column: auto/span 1;
} }
[class*="grid-"][class*="-small-2"] { [class*="grillade-"][class*="-small-2"] {
-ms-grid-columns: (1fr)[2]; -ms-grid-columns: (1fr)[2];
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
} }
[class*="col-"][class*="-small-2"] { [class*="col-"][class*="-small-2"] {
grid-column: auto/span 2; grid-column: auto/span 2;
} }
[class*="grid-"][class*="-small-3"] { [class*="grillade-"][class*="-small-3"] {
-ms-grid-columns: (1fr)[3]; -ms-grid-columns: (1fr)[3];
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
} }
[class*="col-"][class*="-small-3"] { [class*="col-"][class*="-small-3"] {
grid-column: auto/span 3; grid-column: auto/span 3;
} }
[class*="grid-"][class*="-small-4"] { [class*="grillade-"][class*="-small-4"] {
-ms-grid-columns: (1fr)[4]; -ms-grid-columns: (1fr)[4];
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
} }

File diff suppressed because one or more lines are too long

View file

@ -8,7 +8,7 @@
/* ----------------------------- */ /* ----------------------------- */
/* /*
1- Abstracts (variables and mixins) 1- Reboot (basic reset)
2- Base : 2- Base :
- Reset - Reset
- Print - Print
@ -40,25 +40,13 @@
@import "base/reset"; // basic styles @import "base/reset"; // basic styles
@import "base/print"; // print quick reset @import "base/print"; // print quick reset
@import "base/layout"; // alignment, modules, positionning @import "base/layout"; // alignment, modules, positionning
@import "base/utilities"; // width and spacer helpers
@import "base/responsive"; // Responsive Web Design helpers @import "base/responsive"; // Responsive Web Design helpers
// @import "base/wordpress"; // WordPress reset and basic styles
// Utilities (loaded if $utilities variable is true). // New Grid System by default (Grid Layout). If you prefer old "Flexbox" Grid System, replace file with "base/grillade-flex"
@if variable-exists(utilities) and $utilities==true { // Note that none of these files are prefixed by an underscore, in order to compile them.
@import "base/utilities"; // width and spacer helpers @import "base/grillade-grid"; // grid system with Grid Layout
}
// WordPress reset and basics (loaded if $wordpress variable is true).
@if variable-exists(wordpress) and $wordpress==true {
@import "base/wordpress"; // WordPress reset and basic styles
}
// Grid System (Grid Layout chosen if $ie variable is true).
@if variable-exists(ie) and $ie==true {
@import "base/grillade-flex"; // grid system with Flexbox (old version)
} @else {
@import "base/grillade-grid"; // grid system with Grid Layout
}
// Components // Components
@import "components/alerts"; // alerts styles @import "components/alerts"; // alerts styles