Changeset 84037 in spip-zone


Ignore:
Timestamp:
Aug 6, 2014, 4:47:15 PM (5 years ago)
Author:
rastapopoulos@…
Message:

Il semblerait qu'il y ait un conflit de nommage de variable avec quelque chose dans Neat. Si je préfixe par "lg" ici, alors ça a l'air de marcher avec les fonctions de Neat.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • _squelettes_/integraal/theme/css/frameworks/layoutgala/_layoutgala.scss

    r84036 r84037  
    9494}
    9595
    96 @mixin layoutgala-29 ($content-width, $margin: 0, $content-padding-left: 0, $content-padding-right: 0) {
    97         @include layoutgala-percentage2-larger1(right, $content-width, $margin, $content-padding-left, $content-padding-right);
     96@mixin layoutgala-29 ($lg-content-width, $margin: 0, $content-padding-left: 0, $content-padding-right: 0) {
     97        @include layoutgala-percentage2-larger1(right, $lg-content-width, $margin, $content-padding-left, $content-padding-right);
    9898}
    9999
    100 @mixin layoutgala-30 ($content-width, $margin: 0, $content-padding-left: 0, $content-padding-right: 0) {
    101         @include layoutgala-percentage2-larger1(left, $content-width, $margin, $content-padding-left, $content-padding-right);
     100@mixin layoutgala-30 ($lg-content-width, $margin: 0, $content-padding-left: 0, $content-padding-right: 0) {
     101        @include layoutgala-percentage2-larger1(left, $lg-content-width, $margin, $content-padding-left, $content-padding-right);
    102102}
    103103
    104 @mixin layoutgala-33 ($container-width, $content-width) {
    105         @include layoutgala-fixed2(left, $container-width, $content-width, aside1);
     104@mixin layoutgala-33 ($lg-container-width, $lg-content-width) {
     105        @include layoutgala-fixed2(left, $lg-container-width, $lg-content-width, aside1);
    106106}
    107107
    108 @mixin layoutgala-34 ($container-width, $content-width) {
    109         @include layoutgala-fixed2(right, $container-width, $content-width, aside1);
     108@mixin layoutgala-34 ($lg-container-width, $lg-content-width) {
     109        @include layoutgala-fixed2(right, $lg-container-width, $lg-content-width, aside1);
    110110}
    111111
    112 @mixin layoutgala-35 ($container-width, $content-width) {
    113         @include layoutgala-fixed2(right, $container-width, $content-width, content);
     112@mixin layoutgala-35 ($lg-container-width, $lg-content-width) {
     113        @include layoutgala-fixed2(right, $lg-container-width, $lg-content-width, content);
    114114}
    115115
    116 @mixin layoutgala-36 ($container-width, $content-width) {
    117         @include layoutgala-fixed2(left, $container-width, $content-width, content);
     116@mixin layoutgala-36 ($lg-container-width, $lg-content-width) {
     117        @include layoutgala-fixed2(left, $lg-container-width, $lg-content-width, content);
    118118}
    119119
    120 @mixin layoutgala-37 ($container-width, $content-width) {
    121         @include layoutgala-fixed2(right, $container-width, $content-width, container);
     120@mixin layoutgala-37 ($lg-container-width, $lg-content-width) {
     121        @include layoutgala-fixed2(right, $lg-container-width, $lg-content-width, container);
    122122}
    123123
    124 @mixin layoutgala-38 ($container-width, $content-width) {
    125         @include layoutgala-fixed2(right, $container-width, $content-width, container);
     124@mixin layoutgala-38 ($lg-container-width, $lg-content-width) {
     125        @include layoutgala-fixed2(right, $lg-container-width, $lg-content-width, container);
    126126}
    127127
    128 @mixin layoutgala-39 ($container-width, $aside1-width) {
    129         @include layoutgala-fixed1(left, $container-width, $aside1-width);
     128@mixin layoutgala-39 ($lg-container-width, $aside1-width) {
     129        @include layoutgala-fixed1(left, $lg-container-width, $aside1-width);
    130130}
    131131
    132 @mixin layoutgala-40 ($container-width, $aside1-width) {
    133         @include layoutgala-fixed1(right, $container-width, $aside1-width);
     132@mixin layoutgala-40 ($lg-container-width, $aside1-width) {
     133        @include layoutgala-fixed1(right, $lg-container-width, $aside1-width);
    134134}
Note: See TracChangeset for help on using the changeset viewer.