Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
campuses, apply
  • Loading branch information
tsm15002 committed Jul 20, 2016
1 parent ea6621b commit d6e4f3d
Show file tree
Hide file tree
Showing 18 changed files with 343 additions and 76 deletions.
81 changes: 41 additions & 40 deletions dist/css/app.css
Expand Up @@ -1391,47 +1391,41 @@ html {
z-index: 1;
transition: background-color 0.15s cubic-bezier(0.6, 0.06, 0.59, 1); }

.landingNav__element--degrees {
background: url(../img/landing/landing-degrees.jpg) no-repeat center/cover; }
.landingNav__element--degrees:hover .landingNav__elementColorScreen {
background-color: #C1133D; }
.landingNav__element--degrees .landingNav__elementColorScreen {
background-color: rgba(193, 19, 61, 0.6); }
.landingNav__element--red:hover .landingNav__elementColorScreen {
background-color: #C1133D; }

.landingNav__element--concentrations {
background: url(../img/landing/landing-concentrations.jpg) no-repeat center/cover; }
.landingNav__element--concentrations:hover .landingNav__elementColorScreen {
background-color: #EF7C02; }
.landingNav__element--concentrations .landingNav__elementColorScreen {
background-color: rgba(239, 124, 2, 0.6); }
.landingNav__element--red .landingNav__elementColorScreen {
background-color: rgba(193, 19, 61, 0.4); }

.landingNav__element--our-work {
background: url(../img/landing/landing-our-work.jpg) no-repeat center/cover; }
.landingNav__element--our-work:hover .landingNav__elementColorScreen {
background-color: #f3D33D; }
.landingNav__element--our-work .landingNav__elementColorScreen {
background-color: rgba(243, 211, 61, 0.6); }
.landingNav__element--orange:hover .landingNav__elementColorScreen {
background-color: #EF7C02; }

.landingNav__element--for-students {
background: url(../img/landing/landing-for-students.jpg) no-repeat center/cover; }
.landingNav__element--for-students:hover .landingNav__elementColorScreen {
background-color: #76B700; }
.landingNav__element--for-students .landingNav__elementColorScreen {
background-color: rgba(118, 183, 0, 0.6); }
.landingNav__element--orange .landingNav__elementColorScreen {
background-color: rgba(239, 124, 2, 0.4); }

.landingNav__element--campuses {
background: url(../img/landing/landing-campuses.jpg) no-repeat center/cover; }
.landingNav__element--campuses:hover .landingNav__elementColorScreen {
background-color: #1982BE; }
.landingNav__element--campuses .landingNav__elementColorScreen {
background-color: rgba(25, 130, 190, 0.6); }
.landingNav__element--yellow:hover .landingNav__elementColorScreen {
background-color: #f3D33D; }

.landingNav__element--about-us {
background: url(../img/landing/landing-about-us.jpg) no-repeat center/cover; }
.landingNav__element--about-us:hover .landingNav__elementColorScreen {
background-color: #9A2D98; }
.landingNav__element--about-us .landingNav__elementColorScreen {
background-color: rgba(154, 45, 152, 0.6); }
.landingNav__element--yellow .landingNav__elementColorScreen {
background-color: rgba(243, 211, 61, 0.4); }

.landingNav__element--green:hover .landingNav__elementColorScreen {
background-color: #76B700; }

.landingNav__element--green .landingNav__elementColorScreen {
background-color: rgba(118, 183, 0, 0.4); }

.landingNav__element--blue:hover .landingNav__elementColorScreen {
background-color: #1982BE; }

.landingNav__element--blue .landingNav__elementColorScreen {
background-color: rgba(25, 130, 190, 0.4); }

.landingNav__element--purple:hover .landingNav__elementColorScreen {
background-color: #9A2D98; }

.landingNav__element--purple .landingNav__elementColorScreen {
background-color: rgba(154, 45, 152, 0.4); }

.quoteModal {
background-color: #383838;
Expand Down Expand Up @@ -1940,7 +1934,7 @@ html {

.campusHeader__nav {
margin: 0 auto;
max-width: 50em; }
max-width: 48em; }
.campusHeader__nav ul {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -2042,10 +2036,11 @@ html {
display: block;
vertical-align: bottom; }

.studentStoryImg {
.studentStory img {
max-width: 100%;
margin: 0 auto;
margin: 0 auto 1em;
display: block;
height: auto;
vertical-align: bottom; }

.labsImg {
Expand All @@ -2066,6 +2061,12 @@ html {
display: block;
vertical-align: bottom; }

.campusTop {
display: block;
width: 100%;
text-align: center;
font-weight: bold; }

.aboutUsTiles {
max-width: 60em;
margin: 0 auto;
Expand Down Expand Up @@ -2389,7 +2390,7 @@ html {
content: "";
position: absolute;
left: 0em;
top: 0.35em;
top: 0.5em;
width: 0;
height: 0;
border-top: 0.433em solid transparent;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/app.min.css

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions page-campuses.php
@@ -0,0 +1,16 @@
<?php

//change post_type and $context[]

$context = Timber::get_context();
$post = new TimberPost();

$query = array(
'post_type' => 'campus',
'orderby' => 'date',
'order' => 'ASC'
);
query_posts($query);
$context['campuses'] = Timber::get_posts();
$context['post'] = $post;
Timber::render( array( 'page-' . $post->post_name . '.twig', 'page.twig' ), $context );
16 changes: 16 additions & 0 deletions page-home.php
@@ -0,0 +1,16 @@
<?php
$context = Timber::get_context();
$post = new TimberPost();

$query = array(
'post_type' => 'home-post',
'orderby' => 'date',
'order' => 'ASC'
);
query_posts($query);
$context['homeposts'] = Timber::get_posts();
$context['post'] = $post;
Timber::render( array( 'page-' . $post->post_name . '.twig', 'page.twig' ), $context );



2 changes: 1 addition & 1 deletion src/scss/base/pages/apply-now.scss
Expand Up @@ -42,7 +42,7 @@
content:"";
position:absolute;
left:0em;
top:0.35em;
top:0.5em;
width: 0;
height: 0;
border-top: 0.433em solid transparent;
Expand Down
16 changes: 13 additions & 3 deletions src/scss/base/pages/campuses.scss
Expand Up @@ -109,7 +109,7 @@

.campusHeader__nav {
margin:0 auto;
max-width:50em;
max-width:48em;
ul {
margin:0;
padding:0;
Expand Down Expand Up @@ -219,10 +219,11 @@
vertical-align:bottom;
}

.studentStoryImg {
.studentStory img {
max-width:100%;
margin:0 auto;
margin:0 auto 1em;
display:block;
height:auto;
vertical-align:bottom;
}

Expand All @@ -247,3 +248,12 @@
display:block;
vertical-align:bottom;
}


.campusTop {
display:block;
width:100%;
text-align:center;
font-weight:bold;

}
30 changes: 12 additions & 18 deletions src/scss/base/pages/landing.scss
Expand Up @@ -113,58 +113,52 @@
}


.landingNav__element--degrees {
background:url(../img/landing/landing-degrees.jpg) no-repeat center/cover;
.landingNav__element--red {
&:hover .landingNav__elementColorScreen {
background-color:$degrees-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($degrees-color, 0.4);
background-color:transparentize($degrees-color, 0.6);
}
}
.landingNav__element--concentrations {
background:url(../img/landing/landing-concentrations.jpg) no-repeat center/cover;
.landingNav__element--orange {
&:hover .landingNav__elementColorScreen {
background-color:$concentrations-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($concentrations-color, 0.4);
background-color:transparentize($concentrations-color, 0.6);
}
}
.landingNav__element--our-work {
background:url(../img/landing/landing-our-work.jpg) no-repeat center/cover;
.landingNav__element--yellow {
&:hover .landingNav__elementColorScreen {
background-color:$our-work-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($our-work-color, 0.4);
background-color:transparentize($our-work-color, 0.6);
}
}
.landingNav__element--for-students {
background:url(../img/landing/landing-for-students.jpg) no-repeat center/cover;
.landingNav__element--green {
&:hover .landingNav__elementColorScreen {
background-color:$for-students-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($for-students-color, 0.4);
background-color:transparentize($for-students-color, 0.6);
}
}
.landingNav__element--campuses {
background:url(../img/landing/landing-campuses.jpg) no-repeat center/cover;
.landingNav__element--blue {
&:hover .landingNav__elementColorScreen {
background-color:$campuses-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($campuses-color, 0.4);
background-color:transparentize($campuses-color, 0.6);
}
}
.landingNav__element--about-us {
background:url(../img/landing/landing-about-us.jpg) no-repeat center/cover;
.landingNav__element--purple {
&:hover .landingNav__elementColorScreen {
background-color:$about-us-color;
}
.landingNav__elementColorScreen {
background-color:transparentize($about-us-color, 0.4);
background-color:transparentize($about-us-color, 0.6);
}
}

Expand Down
18 changes: 18 additions & 0 deletions template-apply-now.php
@@ -0,0 +1,18 @@
<?php
/*
* Template Name: Apply Now
* Description: A Page Template for the Apply Now page.
*/

//change post_type and $context[]

$context = Timber::get_context();
$post = new TimberPost();

$query = array(
'orderby' => 'date',
'order' => 'ASC'
);
query_posts($query);
$context['post'] = $post;
Timber::render( array( 'page-apply-now.twig', 'page.twig' ), $context );
18 changes: 18 additions & 0 deletions template-campus.php
@@ -0,0 +1,18 @@
<?php
/*
* Template Name: Campus
* Description: A Page Template for the campus pages.
*/

//change post_type and $context[]

$context = Timber::get_context();
$post = new TimberPost();

$query = array(
'orderby' => 'date',
'order' => 'ASC'
);
query_posts($query);
$context['post'] = $post;
Timber::render( array( 'page-campus.twig', 'page.twig' ), $context );
18 changes: 18 additions & 0 deletions template-subpage.php
@@ -0,0 +1,18 @@
<?php
/*
* Template Name: Subpage
* Description: A Page Template for a subpage.
*/

//change post_type and $context[]

$context = Timber::get_context();
$post = new TimberPost();

$query = array(
'orderby' => 'date',
'order' => 'ASC'
);
query_posts($query);
$context['post'] = $post;
Timber::render( array( 'single.twig', 'page.twig' ), $context );
2 changes: 1 addition & 1 deletion templates/base.twig
Expand Up @@ -39,7 +39,7 @@
<div class="u-container">
<div class="pageHeader__titles">
<h3 class="uc_title__levelTwo">SCHOOL OF FINE ARTS</h3>
<h1 class="uc_title__levelOne"><a href="index.php">DIGITAL MEDIA AND DESIGN</a></h1>
<h1 class="uc_title__levelOne"><a href="/">DIGITAL MEDIA AND DESIGN</a></h1>
</div>
<div class="pageHeader__actionButtons">
{% for item in superMenu.get_items %}
Expand Down
12 changes: 6 additions & 6 deletions templates/footer.twig
Expand Up @@ -13,15 +13,15 @@
</nav>
</section>
<section class="mainFooter__apply">
<a href="#" class="mainFooter__applyButton u-borderColor">Application Process</a>
<a href=" http://localhost:8888/application-process/" class="mainFooter__applyButton u-borderColor">Application Process</a>
</section>
</nav>
<nav class="mainFooter__subNav">
<a href="#" class="mainFooter__subNavLink u-s-backgroundColor">&copy; University of Connecticut</a>
<a href="#" class="mainFooter__subNavLink u-s-backgroundColor">Disclaimers, Privacy and Copyright</a>
<a href="#" class="mainFooter__subNavLink u-s-backgroundColor">Webmaster Login</a>
<a href="#" class="mainFooter__subNavLink u-s-backgroundColor">Contact</a>
<a href="#" class="mainFooter__subNavLink u-s-backgroundColor">Degrees</a>
<a href="http://www.uconn.edu" class="mainFooter__subNavLink u-s-backgroundColor">&copy; University of Connecticut</a>
<a href="http://uconn.edu/disclaimers-privacy-copyright/" class="mainFooter__subNavLink u-s-backgroundColor">Disclaimers, Privacy and Copyright</a>
<a href="http://dmd.uconn.edu/wp-admin/" class="mainFooter__subNavLink u-s-backgroundColor">Webmaster Login</a>
<a href="http://dmd.uconn.edu/contact-us/" class="mainFooter__subNavLink u-s-backgroundColor">Contact</a>
<a href="http://dmd.uconn.edu/degrees/" class="mainFooter__subNavLink u-s-backgroundColor">Degrees</a>
</nav>
</section>
</footer>
Expand Down
28 changes: 28 additions & 0 deletions templates/page-apply-now.twig
@@ -0,0 +1,28 @@
{% extends "base.twig" %}

{% block content %}

<main class="u-container">
<section class="applyCampus">
<figure class="applyCampus__inner">
<img src="http://localhost:8888/wp-content/uploads/2016/07/storrs-1.jpg" alt="Storrs" />
<figcaption>
<h1>STORRS</h1>
<a href="http://admissions.uconn.edu/content/freshman" class="applyCampus__link">SUBMIT YOUR APPLICATION</a>
<a href="https://uconnadmissions.slideroom.com/#/Login" class="applyCampus__link">SUBMIT YOUR PORTFOLIO TO SLIDEROOM</a>
</figcaption>
</figure>
</section>
<section class="applyCampus">
<figure class="applyCampus__inner">
<img src="http://localhost:8888/wp-content/uploads/2016/07/stamford-1.jpg" alt="Stamford" />
<figcaption>
<h1>STAMFORD</h1>
<a href="http://admissions.uconn.edu/content/freshman" class="applyCampus__link">SUBMIT YOUR APPLICATION</a>
<a href="https://uconnadmissions.slideroom.com/#/login/program/26304" class="applyCampus__link">SUBMIT YOUR PORTFOLIO TO SLIDEROOM</a>
</figcaption>
</figure>
</section>
</main>

{% endblock %}

0 comments on commit d6e4f3d

Please sign in to comment.