From 323727c79d9328dfcb3646bf9ac38206adbadf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20H=C3=A4gg?= <robin.hagg@thecodebureau.com>
Date: Sun, 13 Sep 2015 14:35:20 +0200
Subject: [PATCH] Almost there

---
 server/templates/pages/about.dust                |  2 +-
 server/templates/pages/services/integration.dust |  4 +++-
 src/js/views/prev-next.js                        |  2 +-
 src/js/views/snap-top.js                         |  2 +-
 src/sass/_content.scss                           | 11 +++++++----
 src/sass/_layout.scss                            |  8 ++++----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/server/templates/pages/about.dust b/server/templates/pages/about.dust
index 4a51e75..41eb405 100644
--- a/server/templates/pages/about.dust
+++ b/server/templates/pages/about.dust
@@ -13,7 +13,7 @@
 	</div>
 	<div class="col customers-say">
 		<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 class="col">
diff --git a/server/templates/pages/services/integration.dust b/server/templates/pages/services/integration.dust
index ab3638d..47660a0 100644
--- a/server/templates/pages/services/integration.dust
+++ b/server/templates/pages/services/integration.dust
@@ -46,8 +46,10 @@
 			</div>
 			<div class="col whole-home-control">
 				<div class="row">
-					<div class="col m-6">
+					<div class="col">
 						<h3>Whole home control, single app</h3>
+					</div>
+					<div class="col m-6">
 						<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>
 
diff --git a/src/js/views/prev-next.js b/src/js/views/prev-next.js
index 5d6fa0e..ed096b3 100644
--- a/src/js/views/prev-next.js
+++ b/src/js/views/prev-next.js
@@ -54,7 +54,7 @@ module.exports = {
 		console.log(this.lastPath)
 
 		//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).addClass('anim-fade')
diff --git a/src/js/views/snap-top.js b/src/js/views/snap-top.js
index c880bc3..a58b214 100644
--- a/src/js/views/snap-top.js
+++ b/src/js/views/snap-top.js
@@ -17,7 +17,7 @@ module.exports = {
 			}
 			else if(!thisView.blockRemove){
 				thisView.$el.removeClass('fixed')
-				$sts.removeClass('hidden')				
+				$sts.removeClass('hidden')
 			}
 		});
 		$(window).trigger('scroll');
diff --git a/src/sass/_content.scss b/src/sass/_content.scss
index b98323a..f9ed814 100644
--- a/src/sass/_content.scss
+++ b/src/sass/_content.scss
@@ -76,7 +76,7 @@
 .page.process {
 	@include backgrounder("process-background", "jpg", "no-repeat center/cover");
 	@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%;
 	min-height: 125%;
@@ -515,11 +515,13 @@
 	.ff1 {background:url(/img/ff1.jpg) no-repeat right/cover;}
 	.ff2 {
 		background:$softwhite;
-		padding:5%;
+		padding-top:5%;
+		padding-left:5%;
+		padding-right:5%;
 		* {color:$softblack;}
 		h3 {
 			@include underlineH(40%, $softblack);
-			margin-bottom:9%;
+			margin-bottom:30px;
 		}
 	}
 	.ff3 {background:url(/img/ff3.jpg) no-repeat top/cover;}
@@ -563,7 +565,7 @@
 				position:absolute;
 				top:0;
 				margin-top:50px;
-				transition:top 1s;
+				transition:top 1s ease;
 				width:95%;
 			}
 		}
@@ -746,6 +748,7 @@
 		padding:5%;
 		p {font-style: italic;}
 		.prevbtn,.nextbtn {
+			display:none;
 			width:40px;
 			height:40px;
 			cursor:pointer;
diff --git a/src/sass/_layout.scss b/src/sass/_layout.scss
index 6cb5bce..c3225b4 100644
--- a/src/sass/_layout.scss
+++ b/src/sass/_layout.scss
@@ -314,12 +314,12 @@ body {
 	}
 	&.anim-fade .page {
 		&.animate {
-			transition: opacity 0.5s linear;
+			transition: right 0.5s ease-out, opacity 0.5s linear;
 			position: absolute;
 			right:0;
 		}
 		&.leave {
-			margin-right: -100%;
+			
 		}
 		&.leave.active {
 			opacity: 0;
@@ -333,7 +333,7 @@ body {
 	}
 	&.anim-neg .page {
 		&.animate {
-			transition: right 0.5s ease-out;
+			transition: right 0.5s ease-out, opacity 0.5s linear;
 			position: absolute;
 		}
 		&.leave {
@@ -351,7 +351,7 @@ body {
 	}
 	&.anim-pos .page {
 		&.animate {
-			transition: right 0.5s ease-out;
+			transition: right 0.5s ease-out, opacity 0.5s linear;
 			position: absolute;
 		}
 		&.leave {