From e7f002845cfcce8080ba0ebf44d9095cbb1421e1 Mon Sep 17 00:00:00 2001 From: Cristina Date: Sun, 30 Oct 2016 18:47:30 +0200 Subject: [PATCH 1/4] created amaro --- source/scss/amaro.scss | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 source/scss/amaro.scss diff --git a/source/scss/amaro.scss b/source/scss/amaro.scss new file mode 100644 index 0000000..a7d9933 --- /dev/null +++ b/source/scss/amaro.scss @@ -0,0 +1,42 @@ +/* + * + * Amaro + * + */ + +@import 'shared'; + +// mixin to extend amaro filter +// @mixin amaro +// @param $filters... {filter} - Zero to many css filters to be added +// @example +// img { +// @include amaro; +// } +// or +// img { +// @include amaro(blur(2px)); +// } +// or +// img { +// @include amaro(blur(2px)) { +// /*...*/ +// }; +// } +@mixin amaro($filters...) { + @include filter-base; + filter: hue-rotate(-2deg) contrast(1.0) brightness(0.9) saturate(1.1); + + &::after { + background: radial-gradient(circle at 29% 33%,rgba(85, 78, 136, 0.28),rgb(72, 17, 76),#540d80 97%); + mix-blend-mode: screen; + } + + @content; +} + +// amaro Instagram filter +%amaro, +.amaro { + @include amaro; +} From 1c513cd3b1d3b1a1c030216e90c6ef9e2a5db340 Mon Sep 17 00:00:00 2001 From: Cristina Date: Sun, 30 Oct 2016 18:47:58 +0200 Subject: [PATCH 2/4] added amaro --- source/scss/cssgram.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/scss/cssgram.scss b/source/scss/cssgram.scss index a328cb9..ba7f36c 100644 --- a/source/scss/cssgram.scss +++ b/source/scss/cssgram.scss @@ -1,4 +1,5 @@ @import 'aden'; +@import 'amaro'; @import 'inkwell'; @import 'perpetua'; @import 'reyes'; @@ -21,4 +22,4 @@ @import 'slumber'; @import 'brannan'; @import 'valencia'; -@import 'kelvin'; \ No newline at end of file +@import 'kelvin'; From 5b81892830e78d48be92e8a0fb5d69d24d7fa878 Mon Sep 17 00:00:00 2001 From: Cristina Date: Sun, 30 Oct 2016 18:50:41 +0200 Subject: [PATCH 3/4] amaro is now done --- site/filters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/filters.json b/site/filters.json index 22aedf7..14328d8 100644 --- a/site/filters.json +++ b/site/filters.json @@ -12,7 +12,7 @@ }, { "name": "Amaro", - "is_done": false, + "is_done": true, "usage": "amaro" }, { @@ -203,4 +203,4 @@ ], "images": ["atx", "bike", "cacti", "lakegeneva", "tahoe"] -} \ No newline at end of file +} From 486fd9368eb4b55309cda5af63132f62299ea761 Mon Sep 17 00:00:00 2001 From: Cristina Date: Sun, 30 Oct 2016 19:03:23 +0200 Subject: [PATCH 4/4] added opacity --- source/scss/amaro.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/source/scss/amaro.scss b/source/scss/amaro.scss index a7d9933..38e39cd 100644 --- a/source/scss/amaro.scss +++ b/source/scss/amaro.scss @@ -30,6 +30,7 @@ &::after { background: radial-gradient(circle at 29% 33%,rgba(85, 78, 136, 0.28),rgb(72, 17, 76),#540d80 97%); mix-blend-mode: screen; + opacity: 0.4; } @content;