search results page

dmd-web-and-mobile · Sep 20, 2016 · d1777d8 · d1777d8
1 parent f4a2ec8
commit d1777d8
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 17 deletions.
diff --git a/dist/css/app.css b/dist/css/app.css
@@ -1442,6 +1442,50 @@ html {
       .not-found h1 a:hover {
         text-decoration: underline; }
 
+.searchResult {
+  display: block;
+  width: 100%;
+  height: 5em;
+  overflow: hidden;
+  background-color: #f1f1f1;
+  margin: 1em;
+  box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.2); }
+  .searchResult:after {
+    content: "";
+    display: table;
+    clear: both; }
+  .searchResult:hover .searchResult__hover {
+    width: 1em;
+    background-color: #97ea00; }
+
+.searchResult__hover {
+  width: 0.25em;
+  height: 5em;
+  display: block;
+  float: left;
+  background-color: black;
+  transition: background-color 0.15s cubic-bezier(0.6, 0.06, 0.59, 1), width 0.15s cubic-bezier(0.6, 0.06, 0.59, 1); }
+
+.searchResult__inner {
+  display: block;
+  float: left;
+  width: auto;
+  height: 5em; }
+  .searchResult__inner img {
+    height: 5em;
+    width: auto;
+    display: block;
+    float: left;
+    vertical-align: center; }
+  .searchResult__inner h1 {
+    display: block;
+    float: left;
+    font-size: 2em;
+    padding: 0 0.5em;
+    line-height: 2.5em;
+    color: black;
+    margin: 0; }
+
 .videoWrapper {
   background-color: white;
   width: 100%;

diff --git a/dist/css/app.min.css b/dist/css/app.min.css
diff --git a/dist/css/uconn/uconn.css b/dist/css/uconn/uconn.css
@@ -279,6 +279,11 @@
   text-transform: capitalize;
   font-weight: 500;
   margin: 0; }
+  .uc_title__levelOne a {
+    color: inherit !important;
+    text-decoration: none; }
+    .uc_title__levelOne a:hover {
+      text-decoration: none; }
 
 .uc_healthFooter {
   font-family: "Proxima Nova", Verdana, Arial, Helvetica, sans-serif; }

diff --git a/dist/css/uconn/uconn.min.css b/dist/css/uconn/uconn.min.css
diff --git a/single-instructor.php b/single-instructor.php
@@ -0,0 +1,4 @@
+<?php 
+
+
+header("location:/aboutus/our-team/");
diff --git a/src/scss/base/_global.scss b/src/scss/base/_global.scss
@@ -21,6 +21,7 @@
 @import 'elements/footer';
 
 @import 'pages/404';
+@import 'pages/search';
 @import 'pages/landing';
 @import 'pages/degrees';
 @import 'pages/concentrations';

diff --git a/src/scss/base/pages/search.scss b/src/scss/base/pages/search.scss
@@ -0,0 +1,55 @@
+
+.searchResult {
+	display:block;
+	width:100%;
+	height:5em;
+	overflow:hidden;
+	background-color:#f1f1f1;
+	margin:1em;
+	box-shadow:0 0 0.5em rgba(0,0,0,0.2);
+	@include clearfix;
+
+	&:hover {
+		.searchResult__hover {
+			width:1em;
+			background-color:#97ea00;
+		}
+	}
+}
+
+.searchResult__hover {
+	width:0.25em;
+	height:5em;
+	display:block;
+	float:left;
+	background-color:black;
+	transition:background-color 0.15s $animation-easing-function, width 0.15s $animation-easing-function;
+}
+
+.searchResult__inner {
+	display:block;
+	float:left;
+	width:auto;
+	height:5em;
+
+	img {
+		height:5em;
+		width:auto;
+		display:block;
+		float:left;
+		vertical-align:center;
+	}
+
+	h1 {
+		display:block;
+		float:left;
+		font-size:2em;
+		padding:0 0.5em;
+		line-height:2.5em;
+		color:black;
+		margin:0;
+	}
+}
+
+
+
diff --git a/templates/base.twig b/templates/base.twig
@@ -24,7 +24,7 @@
               <div class="uc_banner__dropdownButton">
                 <span class="uc_banner__dropdownButtonTriangle"></span>
                 <div class="uc_banner__dropdownBody">
-                  <div class="uc_banner__dropdownElement uc_banner__dropdownElement--selected" data-search-engine="wordpress" data-search-url="http://dmd.uconn.edu/">This Site</div>
+                  <div class="uc_banner__dropdownElement uc_banner__dropdownElement--selected" data-search-engine="wordpress" data-search-url="localhost:8888/">This Site</div>
                   <div class="uc_banner__dropdownElement" data-search-engine="google" data-search-url="http://www.uconn.edu/search/" data-search-params="cx=004595925297557218349%3A65_t0nsuec8">Uconn.edu</div>
                 </div>
               </div>
@@ -64,7 +64,7 @@
     {% endblock %}
 
     <section role="main" class="site-content layout-section">
-      {% if title %}<h1>{{title}}</h1>{% endif %}
+      {% if title %}<div class="u-container"><h1>{{title}}</h1></div>{% endif %}
       <div class="layout-position {{sidebar_class}}">
         {% block content %}
           Sorry, no content

diff --git a/templates/search.twig b/templates/search.twig
@@ -2,26 +2,22 @@
 
 {% block content %}
   <div class="subPage subPage--{{ post.get_field('wpcf-parent') }}">
-    {% if post.get_field('wpcf-hide-back-button') == 0 %}
-    <nav class="subPageNav u-container">
-      <a href="/{{ post.get_field('wpcf-parent') }}" class="subPageNav__link">BACK</a>
-    </nav>
-    {% endif %}
     <div class="u-container">
       <main class="subPageMain">
         <section class="subPageBody">
           {% for result in posts %}
-            <div class="searchResult">
-              <h1><a href="{{result.permalink}}">{{result.title}}</a></h1>
-            </div>
+            <a href="{{result.permalink}}" class="searchResult">
+              <div class="searchResult__hover"></div>
+              <div class="searchResult__inner">
+                {% if result.thumbnail.src != '' %}
+                <img src="{{result.thumbnail.src}}" alt="{{result.title}}">
+                {% endif %}
+                <h1>{{result.title}}</h1>
+              </div>
+            </a>
           {% endfor %}
         </section>
       </main>
     </div>
-    {% if post.get_field('wpcf-hide-back-button') == 0 %}
-    <nav class="subPageNav u-container">
-      <a href="/{{ post.get_field('wpcf-parent') }}" class="subPageNav__link">BACK</a>
-    </nav>
-    {% endif %}
   </div>
 {% endblock %}