Fix merge

MKHenson · Jan 20, 2016 · 11f3cc5 · 11f3cc5
2 parents c09acf6 + a581734
commit 11f3cc5
Show file tree

Hide file tree

Showing 13 changed files with 162 additions and 79 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Blacktip is built in Angular and relies on [ModePress](https://github.com/MKHens
 to provide some its backend content. 
 
 ## Current stable version
-* Version v0.0.24
+* Version v0.0.26
 
 ## Requirements
 * MongoDB v3

diff --git a/install-script.sh b/install-script.sh
@@ -6,7 +6,7 @@ set -e
 
 # Functiom that prints the latest stable version
 version() {
-  echo "0.0.24"
+  echo "0.0.26"
 }
 
 echo "Downloading latest version from github $(version)"

diff --git a/resources/media/images/ilka-franz.jpg b/resources/media/images/ilka-franz.jpg
diff --git a/resources/style.css b/resources/style.css
@@ -245,6 +245,7 @@ th {
 	padding:10px;
 	border-radius:5px;
     border:none;
+    display:inline-block;
 }
 input {
 	outline:none;
@@ -470,36 +471,56 @@ Please only put css rules in here for layout related requirements.
 }
 .service-desc {
 	padding: 0 10%;
+    min-height: 70px;
 }
 .company-service {
 	float:left;
-	width:33.33333333%;
+	width:33.3333333%;
+    box-sizing: border-box;
 	text-align:center;
 	padding: 40px 0 0 0;
 }
+.company-service .button {
+    margin-bottom:30px;
+}
+.company-service:nth-child(3) {
+    border-right: 1px solid #eee;
+    border-left: 1px solid #eee;
+}
 .what-people-say {
-	padding: 90px 10%;
-	text-align: center;
+	padding: 90px 20% 20px 20%;
 	margin: 90px 0 0 0;
 }
+.what-people-say .section {
+    margin:0 0 70px 0;
+}
 .person-profile, .they-say { 
-	display:inline-block;
-
+	float:left;
+}
+.alternate .person-profile {
+    float: right;
+}
+.alternate .they-say {
+    text-align: left;
+}
+.alternate .who-said-it {
+    text-align: left;
 }
 .person-profile { 
 }
 .person-profile img{
-	margin: 0 50px;
+	margin: 0 50px 0 0;
+}
+.alternate .person-profile img{
+	margin: 0 0 0 50px;
 }
 .they-say { 
-	width: 50%;
-	padding-right: 20px;
-	box-sizing: border-box;
-    -moz-box-sizing: border-box;
 	line-height:40px;
+    float:none;
+    text-align:right;
 }
 .who-said-it {
-	margin: 30px 0 0 0;
+	margin: 10px 0 0 0;
     text-align:right;
 }
 .container {
@@ -547,7 +568,7 @@ a .nav-item {
 	display:inline-block;
 }
 .team .more {
-    margin: 50px 120px;
+    margin: 50px 186px;
     line-height: 50px;
 }
 .team .desc {
@@ -585,9 +606,10 @@ a .nav-item {
 .contact-clouds a:hover {
     border:none;
 }
-.contact-form h1 {
+.contact-form h2 {
 	text-align:center;
 	margin: 40px 0 80px 0;
+    font-size:40px;
 }
 .contact-form {
   padding: 40px 80px 60px 80px;
@@ -816,6 +838,16 @@ a:hover {
     color: rgb(7, 111, 194);
     text-decoration:none;
 }
+.blog-header h3 {
+    display: inline-block;
+    margin:0;
+    font-size: inherit;
+}
+.blogs h1 {
+    font-weight:lighter;
+    margin:50px 0;
+    text-align:center;
+}
 .what-we-do, .service-title {
 	color:#666;
 }
@@ -959,16 +991,20 @@ a .nav-item{
 	line-height: 55px;
 	text-align:center;
 }
-.team, .gallery {
-	background:#eee;
+.about h1 {
+    color:inherit;
+    margin: 0 0 100px 0;
+    font-weight: lighter;
 }
-.our-philosophy {
-
+.our-philosophy h2, .team h2 {
+    text-align: center;
+    padding: 80px 0 80px 0;
+    margin: 0;
+    font-size: 50px;
+    font-weight: lighter;
 }
-.team h1, .our-philosophy h1 {
-	text-align:center;
-	padding: 80px 0 80px 0;
-	margin: 0;
+.team, .gallery {
+	background:#eee;
 }
 .about-philo-img {
 	float: right;
@@ -977,11 +1013,11 @@ a .nav-item{
 }
 .about-philo-img img{
   width: 100%;
-  max-width: 600px;
+  max-width: 485px;
 }
 .our-philosophy-content {
-	padding: 0 100px 180px 100px;
-	line-height: 40px;
+	padding: 0 10% 140px 15%;
+	line-height: 50px;
 	text-align: left;
 }
 
@@ -1028,16 +1064,23 @@ input.ng-touched.ng-invalid {
 				MEDIA QUERIES
 ======================================================
 **/
+@media screen and (max-width:1670px) {
+    .service-desc {
+        min-height:90px;
+    }
+}
 @media screen and (max-width:1200px) {
 	.slide-1-text { font-size:45px; }
     .statement img {
         left: calc(100% - 220px);
         width: 300px;
     }
+    .service-desc {
+        min-height:120px;
+    }
 }
 @media screen and (max-width:1100px) { 
 	.they-say { 
-		width: 60%;
 	}
     .statement {
         font-size: 30px;
@@ -1050,28 +1093,27 @@ input.ng-touched.ng-invalid {
 		width: 100%;
 		padding: 50px 0 0 0;
 	}
-	.they-say {
-		width: inherit;
-		padding: 20px 20px;
-		text-align: center;
-	}
+    .company-service:nth-child(3) {
+         border:none;
+    }
+    .service-desc {
+        min-height: initial;
+        margin-bottom:20px;
+    }
 	.what-people-say {
 		margin: 50px 0 0 0;
-		padding: 50px 0;
-	}
-	.person-profile {
-		float: none;
-		margin: 0 auto;
-		width: 150px;
+		padding: 50px 50px;
 	}
 	.person-profile img {
-		width: 100%;
-		margin: 0;
+        margin: 0 20px 0 0;
+	}
+    .alternate .person-profile img {
+        margin: 0 0 0 20px ;
 	}
 	.company {
 		width: 80%;
 		max-width:415px;
-		padding-top: 70px;
+		padding-top: 40px;
 	}
 	.team h1, .our-philosophy h1 {
 		padding: 60px 0;
@@ -1103,16 +1145,32 @@ input.ng-touched.ng-invalid {
         left: calc(100% - 220px);
         width: 250px;
     }
+    .team .more {
+        margin: 50px 80px;
+    }
 }
 @media screen and (max-width:655px) {
+   .person-profile, .they-say, .alternate .person-profile {
+		float:none;
+        text-align: center;
+	}
+    .person-profile img, .alternate .person-profile img {
+        margin: 0 0 20px 0;
+    }
+    .they-say, .who-said-it, .alternate .they-say, .alternate .who-said-it {
+        text-align:center;
+    }
     .post {
         text-align:center;
     }
     .nav-outer {
         height: 100px;
     }
+    .what-we-do-cloud-1 {
+        top:30px;
+    }
     .content-outer {
-        border-top:solid 100px #fff;
+        border-top:solid 0px #fff;
     }
     .post-content {
         padding:15px;
@@ -1131,6 +1189,9 @@ input.ng-touched.ng-invalid {
 	.team {
 		padding: 40px 0;
 	}
+    .team .more {
+        margin: 50px 20px;
+    }
 	.nav-items .active img {
 		display:none;
 	}
@@ -1205,18 +1266,21 @@ input.ng-touched.ng-invalid {
         width: 200px;
     }
 }
-@media screen and (max-width:410px) {
+@media screen and (max-width:435px) {
     .nav-outer {
         height: 170px;
     }
     .state-home .nav-outer {
         height: 120px;
     }
     .content-outer {
-        border-top: solid 170px #fff;
+        border-top: solid 90px #fff;
     }
     .state-home .content-outer {
-        border-top: solid 120px #fff;
+        border-top: solid 20px #fff;
+    }
+    .contact-form {
+        padding: 40px 30px 60px 30px;
     }
 }
 /* smartphones, iPhone, portrait 480x320 phones */ 

diff --git a/resources/templates/about.html b/resources/templates/about.html
@@ -1,11 +1,12 @@
 <div itemscope itemtype="http://schema.org/AboutPage">
 	<div class="about" style="background:url('/media/images/about-city.jpg'); background-size:cover;" itemprop="specialty">
-		Webinate is a development studio. We specialize in building responsive and engaging web and mobile applications.
+		<h1>About</h1>
+		Webinate is a development studio. We specialise in building responsive and engaging web and mobile applications.
 		By using state of the art technology, we look at ways to create solutions for our clients that are as light weight,
 		accessible and intuitive as possible.
 	</div>
 	<div class="our-philosophy" id="our-philosophy">
-		<h1>Our Philosophy</h1>
+		<h2>Our Philosophy</h2>
 		<div class="our-philosophy-content">
 			<div class="about-philo-img"><img alt="webinate philosophy" src="/media/images/thinker.png" /></div>
 			At the heart of our daily operations is a strong sense of technical creativity and expertise;
@@ -20,7 +21,7 @@ <h1>Our Philosophy</h1>
 		</div>
 	</div>
 	<div class="team" id="team" itemscope itemtype="http://schema.org/Organization">
-		<h1>The Team</h1>
+		<h2>The Team</h2>
 		<div class="bio-piece">
 			<img class="team-profile-img" alt="Mathew henson" src="./media/images/mathew-profile.png" itemprop="image" />
 			<div class="bio">

diff --git a/resources/templates/blog-posts.html b/resources/templates/blog-posts.html
@@ -1,18 +1,18 @@
-<div class="blog-item" data-ng-repeat="post in controller.posts" itemscope itemtype="http://schema.org/Blog">
+<article class="blog-item" data-ng-repeat="post in controller.posts" itemscope itemtype="http://schema.org/Blog">
 	<div class="featured-image" data-ng-style="controller.getBlogImageURL(post)">
-        <a data-ng-href="./post/{{post.slug}}"><div class="pic-filler"></div></a>
-        <div class="blackener">                    
-            <div class="blog-header"><a data-ng-href="./post/{{post.slug}}"><span itemprop="name">{{post.title}}</span></a></div>
-            <div class="categories">
-                In 
-                <span data-ng-repeat="category in post.categories" itemprop="keywords">
-                    <a data-ui-sref="blog.posts({category:category})">{{category}}</a>{{$last == false ? "," : ""}}
-                </span>
-                        
-            </div>
-            <div class="author">Posted by <a data-ui-sref="blog.posts({author:post.author})"><span itemprop="author">{{post.author}}</span></a></div>
-            <div class="date" itemprop="dateCreated">{{post.createdOn | date:"dd MMMM yyyy"}}</div>
-            <div class="fix"></div>
-        </div>
-    </div>
-</div>
+		<a data-ng-href="./post/{{post.slug}}"><div class="pic-filler"></div></a>
+		<div class="blackener">
+			<div class="blog-header"><a data-ng-href="./post/{{post.slug}}"><h3 itemprop="name">{{post.title}}</h3></a></div>
+			<div class="categories">
+				In
+				<span data-ng-repeat="category in post.categories" itemprop="keywords">
+					<a data-ui-sref="blog.posts({category:category})">{{category}}</a>{{$last == false ? "," : ""}}
+				</span>
+
+			</div>
+			<div class="author">Posted by <a data-ui-sref="blog.posts({author:post.author})"><span itemprop="author">{{post.author}}</span></a></div>
+			<div class="date" itemprop="dateCreated">{{post.createdOn | date:"dd MMMM yyyy"}}</div>
+			<div class="fix"></div>
+		</div>
+	</div>
+</article>
diff --git a/resources/templates/blog.html b/resources/templates/blog.html
@@ -1,6 +1,6 @@
 <div class="blog">
 	<div class="blogs">
-
+		<h1>Blog</h1>
         <div class="blog-intro">
             <div class="categories">
                 <span data-ng-repeat="category in controller.categories">

diff --git a/resources/templates/contact.html b/resources/templates/contact.html
@@ -6,7 +6,7 @@
 		<a href="https://www.youtube.com/channel/UCtcfpxQJOV-yHbJRuIlBgpA" target="_blank"><img class="norm" src="/media/images/contact-us-youtube.png" /><img class="over" src="/media/images/contact-us-youtube-over.png"  alt="Youtube cloud" /></a>
 	</div>
 	<div class="header">
-		<h1>Get in touch with us</h1>
+		<h1>Contact Us</h1>
 		<div class="what-we-do-cloud what-we-do-cloud-1"></div>
 		<div class="what-we-do-cloud what-we-do-cloud-2"></div>
 		<div class="what-we-do-cloud what-we-do-cloud-4"></div>
@@ -43,7 +43,7 @@ <h1>Get in touch with us</h1>
 		<div class="fix"></div>
 	</div>
 	<div class="contact-form">
-		<h1>Drop Us A Message</h1>
+		<h2>Drop Us A Message</h2>
 		<form name="mailForm" novalidate id="contact-form">
 			<input class="small-input" name="iName" data-ng-class="{error: (mailForm.$submitted || mailForm.iName.$touched) && mailForm.iName.$error.required}" type="text" data-ng-model="controller.mail.name" required="" placeholder="Your Name" />
 			<input class="small-input" name="iEmail" data-ng-class="{error: (mailForm.$submitted || mailForm.iEmail.$touched) && mailForm.iEmail.$error.required}" type="email" data-ng-model="controller.mail.email" required="" placeholder="Your Email" />