Skip to content
This repository has been archived by the owner on May 12, 2019. It is now read-only.

Commit

Permalink
separated background from filter
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Sep 8, 2015
1 parent b7d8e7a commit 1beb4fe
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
Binary file removed assets/img/cover.jpg
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/scss/components/_aside.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
display: block;
width: $aside-width-collapsed;
height: 100%;
@include background-filter;

&.animated {
transition: width $aside-animation-time $aside-animation;
Expand All @@ -16,6 +15,7 @@
font-weight: $font-weight-thin;
color: $gray-lightest;
text-align: center;
@include background-filter;
@include center-absolute;
@include font-shadow;
}
Expand Down
3 changes: 1 addition & 2 deletions assets/scss/components/_media-queries.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
}
.cover {
width: 16rem;
background: $mobile-primary;
transition: all $aside-animation-time;
transform: translate3d(-16rem, 0, 0);

Expand Down Expand Up @@ -97,7 +96,7 @@
padding: .625rem 1.25rem;

&:hover {
background-color: darken($mobile-primary, 5%);
background-color: rgba($black, 0.1);
}
}
#avatar-link {
Expand Down
6 changes: 4 additions & 2 deletions assets/scss/modules/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
}

@mixin background-filter {
background: linear-gradient(150deg, $cover-secondary 30%, $cover-primary 70%)
0 0/cover fixed,url(/assets/img/cover.jpg) center/cover no-repeat fixed;
background: linear-gradient(150deg, $cover-secondary 30%, $cover-primary 70%) 0 0/cover fixed;
}

@mixin center-absolute {
display: flex;
justify-content: center;
align-items: center;
}

@mixin font-shadow {
text-shadow: 0 1px 1px rgba(000, 000, 000, .4);
}

@mixin btn-cover {
position: relative;
display: block;
Expand Down
2 changes: 0 additions & 2 deletions assets/scss/modules/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ $secondary-color : $gray-dark;
$cover-secondary : rgba(#5f2c82, .1);
$cover-primary : rgba(#49a09d, .2);

$mobile-primary : $gray-darkest;

$link-color : $gray-darkest;
$hover-color : $primary-color;

Expand Down
3 changes: 1 addition & 2 deletions partials/aside.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<aside class="cover">

<aside class="cover" style="background: url({{@blog.cover}}) center/cover no-repeat fixed">
<div class="cover container">
<div class="profile">
{{#if @blog.logo}}
Expand Down

0 comments on commit 1beb4fe

Please sign in to comment.