]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Fixes for django-compressor compressing foundation. 7349/head
authorthiggins <thiggins@thiggins.dev.insightsquared.com>
Wed, 2 Dec 2015 16:19:38 +0000 (16:19 +0000)
committerthiggins <thiggins@thiggins.dev.insightsquared.com>
Wed, 2 Dec 2015 16:19:38 +0000 (16:19 +0000)
Running the latest version of django compressor/sass ruby.

scss/components/_media-object.scss
    Breaks when trying to compress the file becauses of $selector.
scss/util/_mixins.scss
    Compiles but corrupts css output making screen unusable.

scss/components/_media-object.scss
scss/util/_mixins.scss

index 1103340fc3a0c69483ba0dcf68a4933110856ecc..812130cce94a091cdaf19ee10fd10347005da916 100644 (file)
@@ -27,7 +27,6 @@ $mediaobject-image-width-stacked: 100% !default;
 /// Adds styles for sections within a media object.
 /// @param {Number} $padding [$mediaobject-section-padding] - Padding between sections.
 @mixin media-object-section($padding: $mediaobject-section-padding) {
-  $selector: &;
   display: table-cell;
   vertical-align: top;
 
@@ -35,7 +34,7 @@ $mediaobject-image-width-stacked: 100% !default;
     padding-#{$global-right}: $padding;
   }
 
-  &:last-child:not(+ $selector:first-child) {
+  &:last-child:not(+ &:first-child) {
     padding-#{$global-left}: $padding;
   }
 }
index 2cac0346107ab0f0a9b05b864aeb708f8fec670d..cf209cd74b4be322c166018ce7cf92e7b792b53e 100644 (file)
 @mixin background-triangle($color: $black) {
   $rgb: 'rgb(#{red($color)}, #{green($color)}, #{blue($color)})';
 
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #{$rgb}'></polygon></svg>");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="24" viewBox="0 0 32 24"><polygon points="0,0 32,0 16,24" style="fill: #{$rgb}"></polygon></svg>');
 
   @media screen and (min-width:0\0) {
     @if lightness($color) < 50% {