our work, for students, etc

dmd-web-and-mobile · Jul 12, 2016 · cdb6a7f · cdb6a7f
1 parent 536701b
commit cdb6a7f
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 11 deletions.
diff --git a/dist/css/app.css b/dist/css/app.css
@@ -1035,11 +1035,13 @@ html {
   box-sizing: border-box;
   width: 100%;
   padding: 2em;
-  text-align: center;
   display: -ms-flexbox;
   display: flex;
   -ms-flex-align: center;
       align-items: center; }
+  .subPageAside__Banner h3 {
+    text-align: center;
+    width: 100%; }
 
 .subPage--degrees h1,
 .subPage--degrees h2,
@@ -2073,7 +2075,8 @@ html {
 .aboutUsTiles {
   max-width: 60em;
   margin: 0 auto;
-  overflow-y: hidden; }
+  overflow-y: hidden;
+  padding: 0.5em 0; }
 
 .aboutUsTile {
   box-sizing: border-box;

diff --git a/dist/css/app.min.css b/dist/css/app.min.css
diff --git a/page-aboutUs.php → page-about-us.php b/page-aboutUs.php → page-about-us.php
@@ -7,11 +7,11 @@ $context = Timber::get_context();
 $post = new TimberPost();
 
 $query = array(
- 'post_type' => 'aboutUs',
+ 'post_type' => 'aboutus',
  'orderby' => 'date',
  'order' => 'ASC'
 );
 query_posts($query);
-$context['about-us'] = Timber::get_posts();
+$context['aboutuss'] = Timber::get_posts();
 $context['post'] = $post;
 Timber::render( array( 'page-' . $post->post_name . '.twig', 'page.twig' ), $context );
diff --git a/page-for-students.php b/page-for-students.php
@@ -0,0 +1,16 @@
+<?php 
+$context = Timber::get_context();
+$post = new TimberPost();
+
+$query = array(
+ 'post_type' => 'forstudents',
+ 'orderby' => 'date',
+ 'order' => 'ASC'
+);
+query_posts($query);
+$context['forstudentss'] = Timber::get_posts();
+$context['post'] = $post;
+Timber::render( array( 'page-' . $post->post_name . '.twig', 'page.twig' ), $context );
+
+
+
diff --git a/page-our-work.php b/page-our-work.php
@@ -0,0 +1,16 @@
+<?php 
+$context = Timber::get_context();
+$post = new TimberPost();
+
+$query = array(
+ 'post_type' => 'ourwork',
+ 'orderby' => 'date',
+ 'order' => 'ASC'
+);
+query_posts($query);
+$context['ourworks'] = Timber::get_posts();
+$context['post'] = $post;
+Timber::render( array( 'page-' . $post->post_name . '.twig', 'page.twig' ), $context );
+
+
+
diff --git a/src/scss/base/elements/subpageLayout.scss b/src/scss/base/elements/subpageLayout.scss
@@ -77,9 +77,12 @@
 	box-sizing:border-box;
 	width:100%;
 	padding:2em;
-	text-align:center;
 	display:flex;
 	align-items:center;
+	h3 {
+		text-align:center;
+		width:100%;
+	}
 }
 
 @each $val in $colorNames {

diff --git a/src/scss/base/pages/about-us.scss b/src/scss/base/pages/about-us.scss
@@ -2,6 +2,7 @@
 	max-width:60em;
 	margin:0 auto;
 	overflow-y:hidden;
+	padding:0.5em 0;
 }
 
 .aboutUsTile {

diff --git a/templates/page-aboutUs.twig → templates/page-about-us.twig b/templates/page-aboutUs.twig → templates/page-about-us.twig
@@ -5,14 +5,14 @@
 	<section class="aboutUsTiles">
 				<figure class="aboutUsTile aboutUsTile--large">
 					<a href="#" class="aboutUsTile__inner">
-						<img src="dist/img/about-us/student-experience.jpg" alt="Student Experience" />
+						<img src="{{ theme.link }}/dist/img/about-us/student-experience.jpg" alt="Student Experience" />
 						<div class="aboutUsTile__caption">
-							<img src="dist/img/about-us/play-button.png" alt="Play Video">
+							<img src="{{ theme.link }}/dist/img/about-us/play-button.png" alt="Play Video">
 							<p class="aboutUsTile__captionText">WATCH OUR STUDENTS SHARE THEIR EXPERIENCE</p>
 						</div>
 					</a>
 				</figure>
-				{% for tile in aboutUsTiles %}
+				{% for tile in aboutuss %}
 				<figure class="aboutUsTile aboutUsTile--small">
 					<a href="{{tile.permalink}}" class="aboutUsTile__inner">
 						<img src="{{tile.thumbnail.src}}" alt="{{tile.slug}}">

diff --git a/templates/page-for-students.twig b/templates/page-for-students.twig
@@ -0,0 +1,20 @@
+{% extends "base.twig" %}
+
+{% block content %}
+<main class="u-container">
+	<section class="forStudentsTiles">
+		{% for tile in forstudentss %}
+		<figure class="forStudentsTile">
+			<a href="{{tile.permalink}}" class="forStudentsTile__inner">
+				<div class="forStudentsTile__image">
+					<img src="{{tile.thumbnail.url}}" alt="{{tile.title}}">
+				</div>
+				<figcaption class="forStudentsTile__caption">
+					<span>{{tile.title}}</span>
+				</figcaption>
+			</a>
+		</figure>
+		{% endfor %}
+	</section>
+</main>
+{% endblock %}
diff --git a/templates/page-our-work.twig b/templates/page-our-work.twig
@@ -0,0 +1,25 @@
+{% extends "base.twig" %}
+
+{% block content %}
+
+<main class="u-container">
+	<section class="ourWorkTiles">
+		{% for tile in ourworks %}
+		<figure class="ourWorkTile">
+			<a href="{{tile.permalink}}" class="ourWorkTile__inner">
+				<div class="ourWorkTile__image">
+					<img src="{{ tile.thumbnail.src }}" alt="{{tile.title}}">
+				</div>
+				<figcaption class="ourWorkTile__caption">
+					<span>{{ tile.title }}</span>
+					<div class="ourWorkTile__caption ourWorkTile__caption--hover">
+						<span>{{ tile.title }}</span>
+					</div>
+				</figcaption>
+			</a>
+		</figure>
+		{% endfor %}
+	</section>
+</main>
+
+{% endblock %}
diff --git a/templates/single.twig b/templates/single.twig
@@ -19,8 +19,8 @@
             <figure class="subPageAside__Image">
               <img src="{{post.get_field('wpcf-side-img')}}" alt="">
             </figure>
-            <a href="#" class="subPageAside__Banner">
-              <h3>Learn more about the Undergraduate Application Process!</h3>
+            <a href="{{post.get_field('wpcf-aside-url')}}" class="subPageAside__Banner">
+              <h3>{{post.get_field('wpcf-aside-text')}}</h3>
             </a>
           </div>
         </aside>