Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Ashby #207

Closed
wants to merge 7 commits into from
Closed

Adds Ashby #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
524345f
adds Ashby
txnnxr Sep 30, 2016
ef04c9b
Revert "adds Ashby"
txnnxr Oct 3, 2016
f9dabac
Merge remote-tracking branch 'una/master'
txnnxr Oct 3, 2016
cea2fdf
adds Ashby filter
txnnxr Oct 3, 2016
b5650f3
almost forgot import statement!
txnnxr Oct 3, 2016
fea9c93
merge
txnnxr Oct 11, 2016
3fb5249
resolve conflicts
txnnxr Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions site/filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
{
"name": "Ashby",
"is_done": false,
"is_done": true,
"usage": "ashby"
},
{
Expand Down Expand Up @@ -203,4 +203,4 @@
],

"images": ["atx", "bike", "cacti", "lakegeneva", "tahoe"]
}
}
41 changes: 41 additions & 0 deletions source/scss/ashby.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
*
* Ashby
*
*/

@import 'shared';
// mixin to extend ashby filter
// @mixin ashby
// @param $filters... {filter} - Zero to many css filters to be added
// @example
// img {
// @include ashby;
// }
// or
// img {
// @include ashby(blur(2px));
// }
// or
// img {
// @include ashby(blur(2px)) {
// /*...*/
// };
// }
@mixin ashby($filters...) {
@extend %filter-base;
filter: contrast(0.78) brightness(1.1) saturate(1.3) sepia(0.12) $filters;

&::after {
background-color: rgba(255, 179, 105, 0.247059);
mix-blend-mode: darken;
}

@content;
}

//ashby Instagram filter
%ashby,
.ashby {
@include ashby;
}
6 changes: 5 additions & 1 deletion source/scss/cssgram.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@
@import 'slumber';
@import 'brannan';
@import 'valencia';
@import 'kelvin';
<<<<<<< HEAD
<<<<<<< HEAD
@import 'ashby';
=======
@import 'kelvin';