From edf01abb1c2cbfffd5e4bedb461127b85d36f3e0 Mon Sep 17 00:00:00 2001 From: y_hokkey Date: Thu, 30 Mar 2017 17:08:22 +0900 Subject: [PATCH 1/3] Fix typo at index.ejs - Remove the unnecessary character "s" --- src/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ejs b/src/index.ejs index a9d821a..dcc0d66 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -12,7 +12,7 @@ PAGE TITLE <% include view/_header %> -s + From e0c0fcc487bcba5e19596116a2a46d3b260089dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=AE=E5=AD=90=20=E5=92=8C=E4=B9=9F?= Date: Fri, 22 Sep 2017 11:01:11 +0900 Subject: [PATCH 2/3] fix sprite mixin --- src/sass/base/_mixin.scss | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/sass/base/_mixin.scss b/src/sass/base/_mixin.scss index a99d3ea..04cbe3f 100644 --- a/src/sass/base/_mixin.scss +++ b/src/sass/base/_mixin.scss @@ -1,32 +1,34 @@ -@mixin sprite-width($sprite,$scale:1) { - width: nth($sprite, 5) * $scale; +@mixin sprite-width($variable,$scale:1) { + width: map_get($variable,width) * $scale; } -@mixin sprite-height($sprite,$scale:1) { - height: nth($sprite, 6) * $scale; +@mixin sprite-height($variable,$scale:1) { + height: map_get($variable,height) * $scale; } -@mixin sprite-position($sprite,$scale:1) { - $sprite-offset-x: nth($sprite, 3) * $scale; - $sprite-offset-y: nth($sprite, 4) * $scale; - background-position: $sprite-offset-x $sprite-offset-y; +@mixin sprite-position($variable,$scale:1) { + $sprite-offset-x: map_get($variable,offset_x) * $scale; + $sprite-offset-y: map_get($variable,offset_y) * $scale; + background-position: $sprite-offset-x $sprite-offset-y; } -@mixin sprite-image($sprite) { - $sprite-image: nth($sprite, 9); - background-image: url(#{$sprite-image}); +@mixin sprite-image($variable) { + $image: map_get($variable,image); + background-image: url(#{$image}); background-repeat: no-repeat; } -@mixin sprite-size($sprite,$scale:1) { - background-size: nth($sprite, 7)*$scale nth($sprite, 8)*$scale; +@mixin sprite-size($variable,$scale:1) { + $total_width: map_get($variable,total_width) * $scale; + $total_height: map_get($variable,total_height) * $scale; + background-size: #{$total_width}px #{$total_height}px; } -@mixin sprite($sprite,$scale:1) { +@mixin sprite($variable,$scale:1) { display: inline-block; - @include sprite-image($sprite); - @include sprite-position($sprite, $scale); - @include sprite-width($sprite, $scale); - @include sprite-height($sprite, $scale); - @include sprite-size($sprite, $scale); + @include sprite-image($variable,image); + @include sprite-position($variable,$scale); + @include sprite-width($variable,$scale); + @include sprite-height($variable,$scale); + @include sprite-size($variable,$scale); } From db27eafb3b37410fd7606526ad643f5fe896d8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=AE=E5=AD=90=20=E5=92=8C=E4=B9=9F?= Date: Thu, 28 Sep 2017 11:40:57 +0900 Subject: [PATCH 3/3] =?UTF-8?q?sprite-position=20mixin=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/base/_mixin.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sass/base/_mixin.scss b/src/sass/base/_mixin.scss index 04cbe3f..11507f4 100644 --- a/src/sass/base/_mixin.scss +++ b/src/sass/base/_mixin.scss @@ -7,9 +7,9 @@ } @mixin sprite-position($variable,$scale:1) { - $sprite-offset-x: map_get($variable,offset_x) * $scale; - $sprite-offset-y: map_get($variable,offset_y) * $scale; - background-position: $sprite-offset-x $sprite-offset-y; + $offset-x: map_get($variable,offset_x) * $scale; + $offset-y: map_get($variable,offset_y) * $scale; + background-position: #{$offset_x}px #{$offset_y}px; } @mixin sprite-image($variable) {