Updates to remove warnings about not using calc
There were warnings about using divide without Calc. (and some commented out ie7-8 things from when I was trying to use a different plugin to compile the sass rather than my current technique
This commit is contained in:
		
							parent
							
								
									148ec2449a
								
							
						
					
					
						commit
						aecb4ae267
					
				| 
						 | 
					@ -17,7 +17,7 @@ form {
 | 
				
			||||||
    display: block;
 | 
					    display: block;
 | 
				
			||||||
    width: 100%;
 | 
					    width: 100%;
 | 
				
			||||||
    margin-bottom: 5px * 2;
 | 
					    margin-bottom: 5px * 2;
 | 
				
			||||||
    *margin-left: -7px;
 | 
					    margin-left: -7px;
 | 
				
			||||||
    padding: 0;
 | 
					    padding: 0;
 | 
				
			||||||
    color: $text-color;
 | 
					    color: $text-color;
 | 
				
			||||||
    border: 0;
 | 
					    border: 0;
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@ form {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  p {
 | 
					  p {
 | 
				
			||||||
    margin-bottom: (5px / 2);
 | 
					    margin-bottom: calc(5px / 2);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ul {
 | 
					  ul {
 | 
				
			||||||
| 
						 | 
					@ -45,7 +45,7 @@ button,
 | 
				
			||||||
select,
 | 
					select,
 | 
				
			||||||
textarea {
 | 
					textarea {
 | 
				
			||||||
  vertical-align: baseline;
 | 
					  vertical-align: baseline;
 | 
				
			||||||
  *vertical-align: middle;
 | 
					  /*vertical-align: middle; */
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
input,
 | 
					input,
 | 
				
			||||||
| 
						 | 
					@ -102,7 +102,7 @@ input[type="radio"] {
 | 
				
			||||||
  height: auto;
 | 
					  height: auto;
 | 
				
			||||||
  padding: 0;
 | 
					  padding: 0;
 | 
				
			||||||
  margin: 3px 0;
 | 
					  margin: 3px 0;
 | 
				
			||||||
  *margin-top: 0;
 | 
					 /* *margin-top: 0; */
 | 
				
			||||||
  line-height: normal;
 | 
					  line-height: normal;
 | 
				
			||||||
  cursor: pointer;
 | 
					  cursor: pointer;
 | 
				
			||||||
  border-radius: 0;
 | 
					  border-radius: 0;
 | 
				
			||||||
| 
						 | 
					@ -114,8 +114,8 @@ input[type="checkbox"],
 | 
				
			||||||
input[type="radio"] {
 | 
					input[type="radio"] {
 | 
				
			||||||
  box-sizing: border-box;
 | 
					  box-sizing: border-box;
 | 
				
			||||||
  padding: 0;
 | 
					  padding: 0;
 | 
				
			||||||
  *width: 13px;
 | 
					/*  *width: 13px; */
 | 
				
			||||||
  *height: 13px;
 | 
					/*  *height: 13px; */
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
input[type="image"] {
 | 
					input[type="image"] {
 | 
				
			||||||
| 
						 | 
					@ -138,12 +138,12 @@ input[type="submit"] {
 | 
				
			||||||
  width: auto;
 | 
					  width: auto;
 | 
				
			||||||
  height: auto;
 | 
					  height: auto;
 | 
				
			||||||
  cursor: pointer;
 | 
					  cursor: pointer;
 | 
				
			||||||
  *overflow: visible;
 | 
					/*  *overflow: visible; */
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
select,
 | 
					select,
 | 
				
			||||||
input[type="file"] {
 | 
					input[type="file"] {
 | 
				
			||||||
  *margin-top: 4px;
 | 
					/*  *margin-top: 4px; */
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
select {
 | 
					select {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@
 | 
				
			||||||
   ========================================================================== */
 | 
					   ========================================================================== */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@function em($target, $context: $doc-font-size) {
 | 
					@function em($target, $context: $doc-font-size) {
 | 
				
			||||||
  @return ($target / $context) * 1em;
 | 
					  @return (calc($target / $context)) * 1em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,7 +65,7 @@
 | 
				
			||||||
  $green: green($color);
 | 
					  $green: green($color);
 | 
				
			||||||
  $blue: blue($color);
 | 
					  $blue: blue($color);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $yiq: (($red*299)+($green*587)+($blue*114))/1000;
 | 
					  $yiq: calc((($red * 299) + ($green * 587) + ($blue * 114)) / 1000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @if $yiq-debug { @debug $yiq, $threshold; }
 | 
					  @if $yiq-debug { @debug $yiq, $threshold; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,8 +64,8 @@ audio,
 | 
				
			||||||
canvas,
 | 
					canvas,
 | 
				
			||||||
video {
 | 
					video {
 | 
				
			||||||
  display: inline-block;
 | 
					  display: inline-block;
 | 
				
			||||||
  *display: inline;
 | 
					/*  display: inline; */
 | 
				
			||||||
  *zoom: 1;
 | 
					/*  zoom: 1; */
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Prevents modern browsers from displaying 'audio' without controls */
 | 
					/* Prevents modern browsers from displaying 'audio' without controls */
 | 
				
			||||||
| 
						 | 
					@ -142,7 +142,7 @@ textarea {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
button,
 | 
					button,
 | 
				
			||||||
input {
 | 
					input {
 | 
				
			||||||
  *overflow: visible; /* inner spacing ie IE6/7*/
 | 
					/*  *overflow: visible; */ /* inner spacing ie IE6/7*/
 | 
				
			||||||
  line-height: normal; /* FF3/4 have !important on line-height in UA stylesheet*/
 | 
					  line-height: normal; /* FF3/4 have !important on line-height in UA stylesheet*/
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,16 +25,16 @@
 | 
				
			||||||
  $unit: unit($value);
 | 
					  $unit: unit($value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @if $unit == 'px' {
 | 
					  @if $unit == 'px' {
 | 
				
			||||||
    @return $value / 16px * 1em;
 | 
					    @return calc($value / 16px * 1em);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  @else if $unit == '%' {
 | 
					  @else if $unit == '%' {
 | 
				
			||||||
    @return $value / 100% * 1em;
 | 
					    @return calc($value / 100% * 1em);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  @else if $unit == 'em' {
 | 
					  @else if $unit == 'em' {
 | 
				
			||||||
    @return $value;
 | 
					    @return $value;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  @else if $unit == 'pt' {
 | 
					  @else if $unit == 'pt' {
 | 
				
			||||||
    @return $value / 12pt * 1em;
 | 
					    @return calc($value / 12pt * 1em);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  @else {
 | 
					  @else {
 | 
				
			||||||
    @return $value;
 | 
					    @return $value;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,7 +52,7 @@ $mfp-include-iframe-type:             true !default;
 | 
				
			||||||
$mfp-iframe-padding-top:              40px !default;
 | 
					$mfp-iframe-padding-top:              40px !default;
 | 
				
			||||||
$mfp-iframe-background:               #000 !default;
 | 
					$mfp-iframe-background:               #000 !default;
 | 
				
			||||||
$mfp-iframe-max-width:                900px !default;
 | 
					$mfp-iframe-max-width:                900px !default;
 | 
				
			||||||
$mfp-iframe-ratio:                    9/16 !default;
 | 
					$mfp-iframe-ratio:                    calc(9/16) !default;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Image-type options
 | 
					// Image-type options
 | 
				
			||||||
$mfp-include-image-type:              true !default;
 | 
					$mfp-include-image-type:              true !default;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -28,7 +28,7 @@ $mfp-include-iframe-type:             true;                       // Enable Ifra
 | 
				
			||||||
$mfp-iframe-padding-top:              40px;                       // Iframe padding top
 | 
					$mfp-iframe-padding-top:              40px;                       // Iframe padding top
 | 
				
			||||||
$mfp-iframe-background:               #000;                       // Background color of iframes
 | 
					$mfp-iframe-background:               #000;                       // Background color of iframes
 | 
				
			||||||
$mfp-iframe-max-width:                900px;                      // Maximum width of iframes
 | 
					$mfp-iframe-max-width:                900px;                      // Maximum width of iframes
 | 
				
			||||||
$mfp-iframe-ratio:                    9/16;                       // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.)
 | 
					$mfp-iframe-ratio:                    calc(9/16);                       // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Image-type options
 | 
					// Image-type options
 | 
				
			||||||
$mfp-include-image-type:              true;                       // Enable Image-type popups
 | 
					$mfp-include-image-type:              true;                       // Enable Image-type popups
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -90,7 +90,7 @@
 | 
				
			||||||
  @if unitless($span-width) {
 | 
					  @if unitless($span-width) {
 | 
				
			||||||
    $container-spread: su-valid-spread($container-spread);
 | 
					    $container-spread: su-valid-spread($container-spread);
 | 
				
			||||||
    $container: _su-sum($columns, $gutters, $container-spread, $validate: false);
 | 
					    $container: _su-sum($columns, $gutters, $container-spread, $validate: false);
 | 
				
			||||||
    @return percentage($span-width / $container);
 | 
					    @return percentage(calc($span-width / $container));
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @return $span-width;
 | 
					  @return $span-width;
 | 
				
			||||||
| 
						 | 
					@ -141,7 +141,7 @@
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $container: _su-sum($columns, $gutters, $container-spread);
 | 
					  $container: _su-sum($columns, $gutters, $container-spread);
 | 
				
			||||||
  @return percentage($gutters / $container);
 | 
					  @return percentage(calc($gutters / $container));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue