Changeset 107692 in spip-zone

Timestamp:

Nov 21, 2017, 5:58:09 PM (3 years ago)

Author:

tcharlss@…

Message:

Ménage : plus besoin de layoutgala

Location:

_squelettes_/integraal/theme/trunk/scss

Files:

• base/_layout.scss (modified) (1 diff)
• frameworks/layoutgala (deleted)
• theme.scss (modified) (2 diffs)

_squelettes_/integraal/theme/trunk/scss/base/_layout.scss

@@ -14 +14 @@
 }
 
-/* Configuration des blocs utiles à la mixin Layoutgala */
-$layoutgala-container-selector: unquote("#falsecontainer");
-$layoutgala-wrapper-selector: unquote("#wrapper");
-$layoutgala-content-selector: unquote("#content");
-$layoutgala-aside1-selector: unquote("#aside");
-$layoutgala-aside2-selector: unquote("#extra");
-$layoutgala-footer-selector: unquote("#falsefooter");
+/* En grand écran, on passe à deux colonnes */
+#container {
+        @include gridle(row);
+}
 
-/* En grand écran, on passe à deux colonnes */
-@include gridle_state( desktop-up ) {
-        /*#content{
-                padding-right:flex-gutter();
-        }
-        @include layoutgala-33(flex-grid(12), flex-grid(9)+flex-gutter());
-        */
+#wrapper {
+        @include gridle( 12 desktop-up 9);
 }
+#aside {
+        @include gridle( 12 desktop-up 3);
+}

_squelettes_/integraal/theme/trunk/scss/theme.scss

@@ -17 +17 @@
 @import "frameworks/shevy/shevy"; // mixins pour contrôler le rhythme vertical - https://kyleshevlin.github.io/shevy/
 @import "base/rythm-settings"; // configuration du rythme vertical
-//@import "frameworks/layoutgala/layoutgala"; // mixins LayoutGala, si on en a besoin - https://blog.html.it/layoutgala/index.html
 //@import "frameworks/sassy-buttons/sassy-buttons"; // mixins pour des boutons faciles - http://jaredhardy.com/sassy-buttons
 
@@ -36 +35 @@
  * Placement des blocs principaux, colonnes, etc
 **/
-//@import "base/layout";
+@import "base/layout";