Przeglądaj źródła

less to sass - need to integrate transition, button and media queries

sarah garcin 9 lat temu
rodzic
commit
0ba300fe22
57 zmienionych plików z 4735 dodań i 322 usunięć
  1. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/6447a33a896771938803b47b10c827fa3e04cfeb/_functions.scssc
  2. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/fonts.scssc
  3. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/gui.scssc
  4. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/layout.scssc
  5. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc
  6. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc
  7. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_accordion.scssc
  8. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_alert-boxes.scssc
  9. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_block-grid.scssc
  10. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_breadcrumbs.scssc
  11. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_button-groups.scssc
  12. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_buttons.scssc
  13. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_clearing.scssc
  14. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_dropdown-buttons.scssc
  15. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_dropdown.scssc
  16. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_flex-video.scssc
  17. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_forms.scssc
  18. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_global.scssc
  19. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_grid.scssc
  20. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_icon-bar.scssc
  21. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_inline-lists.scssc
  22. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_joyride.scssc
  23. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_keystrokes.scssc
  24. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_labels.scssc
  25. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_magellan.scssc
  26. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_offcanvas.scssc
  27. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_orbit.scssc
  28. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_pagination.scssc
  29. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_panels.scssc
  30. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_pricing-tables.scssc
  31. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_progress-bars.scssc
  32. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_range-slider.scssc
  33. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_reveal.scssc
  34. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_side-nav.scssc
  35. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_split-buttons.scssc
  36. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_sub-nav.scssc
  37. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_switches.scssc
  38. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tables.scssc
  39. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tabs.scssc
  40. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_thumbs.scssc
  41. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tooltips.scssc
  42. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_top-bar.scssc
  43. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_type.scssc
  44. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_visibility.scssc
  45. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/fb27e8b9d4e322891fe973e3a35a1c7e89c82b95/foundation.scssc
  46. BIN
      sites/all/themes/gui/materiobasetheme/.sass-cache/fb27e8b9d4e322891fe973e3a35a1c7e89c82b95/normalize.scssc
  47. 87 0
      sites/all/themes/gui/materiobasetheme/css/fonts.css
  48. 3 0
      sites/all/themes/gui/materiobasetheme/css/gui.css
  49. 73 0
      sites/all/themes/gui/materiobasetheme/css/layout.css
  50. 92 0
      sites/all/themes/gui/materiobasetheme/css/misc.css
  51. 4146 0
      sites/all/themes/gui/materiobasetheme/css/styles.css
  52. 34 36
      sites/all/themes/gui/materiobasetheme/css/wysiwyg.css
  53. 1 1
      sites/all/themes/gui/materiobasetheme/package.json
  54. 25 19
      sites/all/themes/gui/materiobasetheme/scss/gui.scss
  55. 43 41
      sites/all/themes/gui/materiobasetheme/scss/layout.scss
  56. 1 1
      sites/all/themes/gui/materiobasetheme/scss/misc.scss
  57. 230 224
      sites/all/themes/gui/materiobasetheme/scss/styles.scss

BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/6447a33a896771938803b47b10c827fa3e04cfeb/_functions.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/fonts.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/gui.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/layout.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_accordion.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_alert-boxes.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_block-grid.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_breadcrumbs.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_button-groups.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_buttons.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_clearing.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_dropdown-buttons.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_dropdown.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_flex-video.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_forms.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_global.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_grid.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_icon-bar.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_inline-lists.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_joyride.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_keystrokes.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_labels.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_magellan.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_offcanvas.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_orbit.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_pagination.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_panels.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_pricing-tables.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_progress-bars.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_range-slider.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_reveal.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_side-nav.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_split-buttons.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_sub-nav.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_switches.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tables.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tabs.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_thumbs.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_tooltips.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_top-bar.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_type.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/9146e852b0eeb835e9ae48b4a1aae010062288ce/_visibility.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/fb27e8b9d4e322891fe973e3a35a1c7e89c82b95/foundation.scssc


BIN
sites/all/themes/gui/materiobasetheme/.sass-cache/fb27e8b9d4e322891fe973e3a35a1c7e89c82b95/normalize.scssc


Plik diff jest za duży
+ 87 - 0
sites/all/themes/gui/materiobasetheme/css/fonts.css


+ 3 - 0
sites/all/themes/gui/materiobasetheme/css/gui.css

@@ -0,0 +1,3 @@
+/*
+ * www.g-u-i.net
+ */

Plik diff jest za duży
+ 73 - 0
sites/all/themes/gui/materiobasetheme/css/layout.css


Plik diff jest za duży
+ 92 - 0
sites/all/themes/gui/materiobasetheme/css/misc.css


Plik diff jest za duży
+ 4146 - 0
sites/all/themes/gui/materiobasetheme/css/styles.css


Plik diff jest za duży
+ 34 - 36
sites/all/themes/gui/materiobasetheme/css/wysiwyg.css


+ 1 - 1
sites/all/themes/gui/materiobasetheme/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "autoprefixer-core": "^5.1.5",
-    "grunt-contrib-compass": "v0.9.0",
+    "grunt-contrib-compass": "^0.9.0",
     "grunt-contrib-sass": "v0.7.3",
     "grunt-contrib-watch": "v0.6.1",
     "grunt-postcss": "^0.3.0",

+ 25 - 19
sites/all/themes/gui/materiobasetheme/scss/gui.scss

@@ -67,9 +67,9 @@ $red:#E60000;
 // ===== SHORTCUTS ======================================================================================================= 
 
 // padding
-@mixin p($p){ padding:$arguments; }
-@mixin p($v, $h){ padding:$arguments; }
-@mixin p($t, $l, $b, $l){ padding:$arguments; }
+// @mixin p($p){ padding:$arguments; }
+// @mixin p($v, $h){ padding:$arguments; }
+// @mixin p($t, $l, $b, $l){ padding:$arguments; }
 
 @mixin pt($p){ padding-top:$p; }
 @mixin pr($p){ padding-right:$p; }
@@ -77,9 +77,9 @@ $red:#E60000;
 @mixin pl($p){ padding-left:$p; }
 
 // margin
-@mixin m($p){ margin:$arguments; }
-@mixin m($v, $h){ margin:$arguments; }
-@mixin m($t, $l, $b, $l){ margin:$arguments; }
+// @mixin m($p){ margin:$arguments; }
+// @mixin m($v, $h){ margin:$arguments; }
+// @mixin m($t, $l, $b, $l){ margin:$arguments; }
 
 @mixin mt($m){ margin-top:$m; }
 @mixin mr($m){ margin-right:$m; }
@@ -89,11 +89,11 @@ $red:#E60000;
 @mixin no-margin(){ margin:0; padding:0; }
 
 // border
-@mixin b($b){ border: $b; }
-@mixin b($size, $color){ border: $size solid $color; }
+// @mixin b($b){ border: $b; }
+// @mixin b($size, $color){ border: $size solid $color; }
 
 @mixin bt($b){ border-top: $b;}
-@mixin bt($size, $color){border-top: $size solid $color;}
+//@mixin bt($size, $color){border-top: $size solid $color;}
 
 @mixin br($b){ border-right: $b;}
 @mixin br($size, $color){border-right: $size solid $color;}
@@ -179,13 +179,12 @@ $red:#E60000;
 // =
 // =
 // ===== DISPLAY UTILS =================================================================================================== 
-
 // Inline blocks
-@mixin inlineblock($top)
+@mixin inlineblock()
 {
     display:moz-inline-stack;
     display:inline-block;
-    vertical-align:$align;
+    vertical-align:top;
     zoom:1;
     *display:inline;
     // .ie7 &, .ie8 &{display:block;float:left;}
@@ -401,26 +400,33 @@ $g:0;
 //   |     'linear , ease-out , linear , ease-out'
 //   |  );
 //
-@mixin transition($property: all)
+// $property: all;
+// $duration: 1s;
+// $transitiondelay:0s;
+// $timingfunction: "ease-out";
+@mixin transition($property)
 {
   -webkit-transition: $property;
      -moz-transition: $property;
        -o-transition: $property;
           transition: $property;
 }
-@mixin transition($property, $duration)
+$arguments:("all", 0s);
+@mixin transition($arguments)
 {
   -webkit-transition: $arguments;
      -moz-transition: $arguments;
        -o-transition: $arguments;
           transition: $arguments;
 }
-@mixin transition($property, $duration, $transitiondelay, $timingfunction:ease-out)
+//$parameters:($property, $duration, $transitiondelay, "ease-out");
+$parameters:("all", 0s, "ease-out");
+@mixin transition($parameters)
 {
-  -webkit-transition: $arguments;
-     -moz-transition: $arguments;
-       -o-transition: $arguments;
-          transition: $arguments;
+  -webkit-transition: $parameters;
+     -moz-transition: $parameters;
+       -o-transition: $parameters;
+          transition: $parameters;
 }
 @mixin transitions($property: all, $duration:0s, $transitiondelay:0s, $timingfunction:ease-out)
 {

+ 43 - 41
sites/all/themes/gui/materiobasetheme/scss/layout.scss

@@ -1,24 +1,24 @@
 
 /** RESPONSIVE break points */
 
-@max-480  : ~"screen and (max-width: 479px)";
-@min-480  : ~"screen and (min-width: 480px)";
+// @max-480  : ~"screen and (max-width: 479px)";
+// @min-480  : ~"screen and (min-width: 480px)";
 
-@480-768  : ~"screen and (min-width: 480px) and (max-width: 767px)";
+// @480-768  : ~"screen and (min-width: 480px) and (max-width: 767px)";
 
-@max-768  : ~"screen and (max-width: 767px)";
-@min-768  : ~"screen and (min-width: 768px)";
+// @max-768  : ~"screen and (max-width: 767px)";
+// @min-768  : ~"screen and (min-width: 768px)";
 
-@768-980  : ~"screen and (min-width: 768px) and (max-width: 979px)";
+// @768-980  : ~"screen and (min-width: 768px) and (max-width: 979px)";
 
-@max-980  : ~"screen and (max-width: 979px)";
-@min-980  : ~"screen and (min-width: 980px)";
+// @max-980  : ~"screen and (max-width: 979px)";
+// @min-980  : ~"screen and (min-width: 980px)";
 
-@980-1200  : ~"screen and (min-width: 980px) and (max-width: 1199px)";
-
-@max-1200 : ~"screen and (max-width: 1199px)";
-@min-1200 : ~"screen and (min-width: 1200px)";
+// @980-1200  : ~"screen and (min-width: 980px) and (max-width: 1199px)";
 
+// @max-1200 : ~"screen and (max-width: 1199px)";
+// @min-1200 : ~"screen and (min-width: 1200px)";
+// change this
 
 html, body{
   // position:relative;
@@ -30,53 +30,56 @@ body{
   overflow-y:scroll; top:0;
 }
 
-@rootminwidth : 320px;
+$rootminwidth : 320px;
 
 /** NIVEAU 0 */
 #root{
-  min-width:@rootminwidth;
+  min-width:$rootminwidth;
 
   .ie8 &{min-width:1024px;}
 }
 
 /** NIVEAU 1 */
-#container{ margin:0 auto; position:relative; .transition(padding-top, 0.5s, ease-out);}
+#container{ 
+  margin:0 auto; position:relative; 
+  @include transition(padding-top 0.5s ease-out); // change this
+}
 
 /** NIVEAU 2 */
-.padded(){ @p:2%; width:100%-2*@p; padding-left:@p; padding-right:@p; }
+@mixin padded(){ $p:2%; width:100%-2*$p; padding-left:$p; padding-right:$p; }
 
-@header-z-index:1000;
+$header-z-index:1000;
 #header{
-  @media @min-768{
-    position:fixed; top:0; margin:0 auto; .bgc(#fff); min-width:@rootminwidth*0.97;
-  }
-  z-index:@header-z-index;
-  .padded;
-  .editmenu-enabled &{ .mt(30px); }
-  .admin-menu &{ .mt(35px); }
+  // @media @min-768{
+  //   position:fixed; top:0; margin:0 auto; @include bgc(#fff); min-width:@rootminwidth*0.97;
+  // } //change this
+  z-index:$header-z-index;
+  @include padded;
+  .editmenu-enabled &{ @include mt(30px); }
+  .admin-menu &{ @include mt(35px); }
 }
 
 #utilities{
-  @media @min-768{
-    html.no-touch &{
-      position:fixed; top:0; margin:0 auto; min-width:@rootminwidth*0.97;
-      .mt(60px);
-    }
-    html.no-touch .editmenu-enabled &{ .mt(80px); }
-    html.no-touch .admin-menu &{ .mt(85px); }
-  }
-  @media @max-768{
-    >.region{.pt(5px); .pb(5px);}
-  }
+  // @media @min-768{
+  //   html.no-touch &{
+  //     position:fixed; top:0; margin:0 auto; min-width:@rootminwidth*0.97;
+  //     @include mt(60px);
+  //   }
+  //   html.no-touch .editmenu-enabled &{ @include mt(80px); }
+  //   html.no-touch .admin-menu &{ @include mt(85px); }
+  // }
+  // @media @max-768{
+  //   >.region{@include pt(5px); @include pb(5px);}
+  // } change this
   z-index:999;
-  .bgc(#fff);
-  .padded;
+  @include bgc(#fff);
+  @include padded;
 
 }
 
-#main{.padded; overflow-x:hidden;}
+#main{@include padded; overflow-x:hidden;}
 
-#footer{.padded;}
+#footer{@include padded;}
 
 /** NIVEAU 3 */
 
@@ -87,8 +90,7 @@ body{
 
 // #container, #header-blocks, #center{.transition(width, 0.5s, ease-out); }
 
-
-.footer-block .region, .header-block{ .inlineblock();}
+// .footer-block .region, .header-block{ @include inlineblock();} change this
 
 /** NIVEAU 4 */
 #center{ padding:5px; }

+ 1 - 1
sites/all/themes/gui/materiobasetheme/scss/misc.scss

@@ -38,7 +38,7 @@ div.messages { @include messages();}
 .messages-label{display:none;}
 
 #better-messages-wrapper{
-  background-color: rgba(255,255,255,0.7); @include p(10px); @include rounded(5px); @include drop-shadow(0, 0, 6px, 0.4);
+  background-color: rgba(255,255,255,0.7); padding :10px; @include rounded(5px); @include drop-shadow(0, 0, 6px, 0.4);
   #better-messages-default{
 
     div.messages{

Plik diff jest za duży
+ 230 - 224
sites/all/themes/gui/materiobasetheme/scss/styles.scss


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików