Skip to content

Commit

Permalink
Merge branch 'release-day-100' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jonsuh committed Nov 14, 2015
2 parents 5c47d6e + 60d4d80 commit ff29094
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 6 deletions.
Binary file added assets/images/day-100-verse.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/day-100-verse@2x.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/day-100.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions assets/sass/days/_100.scss
@@ -0,0 +1,91 @@
// ==================================================
// Day 100
// ==================================================
.day--100 {
background-color: #34374a;
position: relative;

.day-number {
position: relative;
z-index: 2;
}
}

.day-100-column--verse {
height: em-calc(500);
width: 100%;
position: absolute;
top: 0;
background: url(../images/day-100-verse.jpg) center;
@include mq(xlarge) {
background-image: url(../images/day-100-verse@2x.jpg);
}
background-size: cover;
left: 0;
}

.day-100-column--text {
color: $white;
margin-top: em-calc(415);
}

@include mq(mid) {
.day--100 {
height: em-calc(550);
}

.day-100-column {
height: auto;
width: 50%;
position: absolute;
bottom: 0;
top: 0;
}

.day-100-column--text {
margin-top: 0;
left: 50%;
}
}

@include mq(large) {
.day--100 {
height: em-calc(600);
}
}

.day-100-text {
@extend .day;
$font-size: 15;

font-size: em-calc($font-size);
line-height: 1.3;
max-width: em-calc(400, 15);
margin-left: auto;
margin-right: auto;
@include font-smoothing;

p + p {
margin-top: 1.5em;
}

a {
color: #6d839a;
}

@include mq(medium) {
$font-size: 16;

font-size: em-calc(16);
max-width: em-calc(400, $font-size);
}

@include mq(large) {
$font-size: 17;

font-size: em-calc(17);
max-width: em-calc(400, $font-size);
margin-left: 0;
margin-right: 0;
}
}
1 change: 1 addition & 0 deletions assets/sass/screen.scss
Expand Up @@ -24,6 +24,7 @@
// ==================================================
// Days
// ==================================================
@import "days/100";
@import "days/099";
@import "days/098";
@import "days/097";
Expand Down

0 comments on commit ff29094

Please sign in to comment.