lkm/stomping-grounds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Almost there

Browse Source
This commit is contained in:
Robin Hägg 2015-09-13 14:35:20 +02:00
parent 859e702235
commit 323727c79d
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/templates/pages/about.dust
View File

@ -13,7 +13,7 @@
</div> </div>
<div class="col customers-say"> <div class="col customers-say">
<div class="row"> <div class="row">
<h2><strong>Here's what some of<br> our customers have to say</strong></h2> <h2><strong>Here's what one of<br> our customers had to say</strong></h2>
</div> </div>
</div> </div>
<div class="col"> <div class="col">

4
server/templates/pages/services/integration.dust
View File

@ -46,8 +46,10 @@
</div> </div>
<div class="col whole-home-control"> <div class="col whole-home-control">
<div class="row"> <div class="row">
<div class="col m-6"> <div class="col">
<h3>Whole home control, single app</h3> <h3>Whole home control, single app</h3>
</div>
<div class="col m-6">
<h4>Audio Visual</h4> <h4>Audio Visual</h4>
<p>Choose your room, select what you want to watch or listen to and sit back and enjoy your entertainment, at the touch of a button.</p> <p>Choose your room, select what you want to watch or listen to and sit back and enjoy your entertainment, at the touch of a button.</p>

2
src/js/views/prev-next.js
View File

@ -54,7 +54,7 @@ module.exports = {
console.log(this.lastPath) console.log(this.lastPath)
//Valet shit //Valet shit
if((this.notVisibleOn.indexOf(path) != -1 || path == '/services') && (this.notVisibleOn.indexOf(this.lastPath) != -1 || this.lastPath == '/services' || this.lastPath == '/')) if((this.notVisibleOn.indexOf(path) != -1 || path == '/services') && (this.notVisibleOn.indexOf(this.lastPath) != -1 || this.lastPath == '/services'))
{ {
$(document.body).removeClass('anim-fade anim-neg anim-pos') $(document.body).removeClass('anim-fade anim-neg anim-pos')
$(document.body).addClass('anim-fade') $(document.body).addClass('anim-fade')

11
src/sass/_content.scss
View File

@ -76,7 +76,7 @@
.page.process { .page.process {
@include backgrounder("process-background", "jpg", "no-repeat center/cover"); @include backgrounder("process-background", "jpg", "no-repeat center/cover");
@media all and(orientation:portrait){ @media all and(orientation:portrait){
@include backgrounder("process-background-portrait", "jpg", "no-repeat center/cover"); background:url(/img/process-background-portrait-full.jpg) no-repeat center/cover;
} }
width:100%; width:100%;
min-height: 125%; min-height: 125%;
@ -515,11 +515,13 @@
.ff1 {background:url(/img/ff1.jpg) no-repeat right/cover;} .ff1 {background:url(/img/ff1.jpg) no-repeat right/cover;}
.ff2 { .ff2 {
background:$softwhite; background:$softwhite;
padding:5%; padding-top:5%;
padding-left:5%;
padding-right:5%;
* {color:$softblack;} * {color:$softblack;}
h3 { h3 {
@include underlineH(40%, $softblack); @include underlineH(40%, $softblack);
margin-bottom:9%; margin-bottom:30px;
} }
} }
.ff3 {background:url(/img/ff3.jpg) no-repeat top/cover;} .ff3 {background:url(/img/ff3.jpg) no-repeat top/cover;}
@ -563,7 +565,7 @@
position:absolute; position:absolute;
top:0; top:0;
margin-top:50px; margin-top:50px;
transition:top 1s; transition:top 1s ease;
width:95%; width:95%;
} }
} }
@ -746,6 +748,7 @@
padding:5%; padding:5%;
p {font-style: italic;} p {font-style: italic;}
.prevbtn,.nextbtn { .prevbtn,.nextbtn {
display:none;
width:40px; width:40px;
height:40px; height:40px;
cursor:pointer; cursor:pointer;

8
src/sass/_layout.scss
View File

@ -314,12 +314,12 @@ body {
} }
&.anim-fade .page { &.anim-fade .page {
&.animate { &.animate {
transition: opacity 0.5s linear; transition: right 0.5s ease-out, opacity 0.5s linear;
position: absolute; position: absolute;
right:0; right:0;
} }
&.leave { &.leave {
margin-right: -100%;
} }
&.leave.active { &.leave.active {
opacity: 0; opacity: 0;
@ -333,7 +333,7 @@ body {
} }
&.anim-neg .page { &.anim-neg .page {
&.animate { &.animate {
transition: right 0.5s ease-out; transition: right 0.5s ease-out, opacity 0.5s linear;
position: absolute; position: absolute;
} }
&.leave { &.leave {
@ -351,7 +351,7 @@ body {
} }
&.anim-pos .page { &.anim-pos .page {
&.animate { &.animate {
transition: right 0.5s ease-out; transition: right 0.5s ease-out, opacity 0.5s linear;
position: absolute; position: absolute;
} }
&.leave { &.leave {