Merge branch 'development'

isubit · Jun 12, 2017 · e5e5f29 · e5e5f29
2 parents 48bdb28 + 1f3adb9
commit e5e5f29
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 46 deletions.
diff --git a/css/suitcase.css b/css/suitcase.css
@@ -487,14 +487,16 @@ figure.image.floated-right img {
 /* -------------------- */
 /* Forms */
 
-/* Form Buttons */
-
 input[type=text] {
-    padding: 1em;
+    height: auto;
+    max-width: 100%;
+    padding: 0.5rem;
     border: 1px solid #ddd;
     border-radius: 2px;
 }
 
+/* Form Buttons */
+
 input[type=submit].form-submit {
     margin: 0 0.5rem 0 0;
     padding: 0.25rem 0.5rem;
@@ -691,6 +693,104 @@ input[type=submit].form-submit {
     color: #f77737;
 }
 
+/* -------------------- */
+/* Image link blocks */
+
+/* --- Image with link below --- */
+
+.image-link a {
+    display: block;
+    color: #ffffff;
+    line-height: 0;
+    text-decoration: none;
+}
+
+.image-link a:hover {
+    box-shadow: 0 0 5px 1px #7a99ac;
+}
+
+.image-link img {
+    width: 100%;
+}
+
+.image-link h2,
+.image-link p {
+    margin: 0;
+    padding: 0.75rem;
+    line-height: 1.25;
+    font-weight: normal;
+    text-align: center;
+    background: #cc0000;
+}
+
+.image-link i {
+    margin-right: 0.5rem;
+}
+
+.image-link.link-red h2,
+.image-link.link-red p { background: #cc0000; }
+
+.image-link.link-blue h2,
+.image-link.link-blue p { background: #006ba6; }
+
+.image-link.link-green h2,
+.image-link.link-green p { background: #76881d; }
+
+.image-link.link-dark-red h2,
+.image-link.link-dark-red p { background: #7c2529; }
+
+.image-link.link-dark-blue h2,
+.image-link.link-dark-blue p { background: #003D4C; }
+
+.image-link.link-dark-green h2,
+.image-link.link-dark-green p { background: #3E4827; }
+
+/* --- Image with link overlay --- */
+
+.image-overlay a {
+    display: block;
+    position: relative;
+    color: #ffffff;
+    line-height: 0;
+    text-decoration: none;
+}
+
+.image-overlay a:hover {
+    box-shadow: 0 0 5px 1px #7a99ac;
+}
+
+.image-overlayimg {
+    width: 100%;
+}
+
+.image-overlay h2,
+.image-overlay p {
+    position: absolute;
+    bottom: 20%;
+    right: 0;
+    width: auto;
+    max-width: 90%;
+    margin: 0;
+    padding: 0.5rem 0.75rem;
+    line-height: 1.25;
+    font-weight: normal;
+    text-align: right;
+    background: rgba(0, 0, 0, 0.75);
+}
+
+.image-overlay.overlay-full h2,
+.image-overlay.overlay-full p {
+    bottom: 0;
+    width: 100%;
+    max-width: none;
+    text-align: left;
+}
+
+.image-overlay i {
+    margin-right: 0.5rem;
+}
+
+
 /* -------------------- */
 /* ## UTILITY 
 /* -------------------- */
@@ -709,6 +809,13 @@ input[type=submit].form-submit {
     padding: 0.5rem;
 }
 
+.luggage-gridrow img,
+.luggage-gridrow3 img,
+.luggage-gridrow4 img {
+    float: left;
+    padding: 0 1rem 1rem 0;
+}
+
 .luggage-gridrow,
 .luggage-gridrow3,
 .luggage-gridrow4 {
@@ -1238,13 +1345,16 @@ ul.tabs.secondary img {
 /* ## HOME 
 /* ---------------------------------------- */
 
+.front main.region { margin-top: 0; }
+
 /* -------------------- */
 /* ## FLEXSLIDER  
 /* -------------------- */
 
 .flexslider {
     margin: 0;
     border: 0;
+    box-shadow: none;
 }
 
 .flexslider img { height: 100%; }
@@ -1282,6 +1392,19 @@ ul.tabs.secondary img {
     z-index: 2;
 }
 
+.flex-control-paging li a {
+    color: #ffffff;
+    background: #616161;
+}
+
+.flex-control-paging li a.flex-active {
+    background: #cc0000;
+}
+
+.flex-pauseplay a {
+    line-height: 20px;
+}
+
 /* ---------------------------------------- */
 /* ## PANELS 
 /* ---------------------------------------- */
@@ -1531,7 +1654,7 @@ h2.block-title {
 
 .block-facetapi .item-list ul ul {
     margin-top: 0;
-    margin-left: 1rem;
+    margin-left: 1.5rem;
 }
 
 .block-facetapi .item-list li {
@@ -1566,6 +1689,15 @@ h2.block-title {
     border-color: #ddd;
 }
 
+.block-facetapi .item-list li.expanded {
+    list-style-type: none;
+    list-style-image: none;
+}
+
+.block-facetapi .item-list li.expanded a {
+    margin-bottom: 0.25rem;
+}
+
 /* -------------------- */
 /* Just Tags */
 
@@ -2060,6 +2192,12 @@ table.responsive-table,
     }
 }
 
+/* --- Views Tables - Overflow --- */
+/* Add this class to table Views */
+
+.views-table-overflow .view-content {
+    overflow-x: auto;
+}
 
 /* ---------------------------------------- */
 /* ## SEARCH 
@@ -2225,11 +2363,6 @@ h2.node-title {
     font-size: inherit;
 }
 
-.views-field-field-people-image {
-    margin-right: 1em;
-    float: left;
-}
-
 .views-field.views-field-field-people-position {
     margin-bottom: 1rem;
     color: #616161;
@@ -2261,14 +2394,6 @@ h2.node-title {
     clear: both;
 }
 
-.node-people .field-label-inline .field-label:after,
-.node-people .field-label-above .field-label:after,
-.node-people fieldset.group-contact:after {
-    content: '';
-    display: block;
-    clear: both;
-}
-
 /* -------------------- */
 /* ## RESOURCES 
 /* -------------------- */

diff --git a/js/suitcase_responsive_tables.js b/js/suitcase_responsive_tables.js
@@ -2,8 +2,8 @@
 
 $(document).ready(function() {
 
-	// Just tables in content
-	var table = $('.field-items table');
+	// Find tables in content, or Views tables with the .views-table-responsive class
+	var table = $('.field-items table, .views-table-responsive table');
 
 /* --------------------- 
 First, check the table 
@@ -75,4 +75,4 @@ to make the tables responsive
 	});
 });
 
-})(jQuery);
+})(jQuery);
diff --git a/templates/default_region_content_blocks/footer_fourth.tpl.php b/templates/default_region_content_blocks/footer_fourth.tpl.php
@@ -1,8 +1,12 @@
+<p>Copyright &copy; <?php (module_exists('token_filter')) ? print('[current-date:custom:Y]') : print date('Y'); ?> <br /> Iowa State University of Science and Technology. All rights reserved.</p>
 <ul class="menu">
   <li class="first leaf">
-    <a href="<?php print $GLOBALS['base_url']; ?>/site-index"><i class="fa fa-list-ul" aria-hidden="true"></i>Site Index</a>
+    <a href="http://www.policy.iastate.edu/policy/discrimination">Non-discrimination Policy</a>
+  </li>
+  <li class="leaf">
+    <a href="http://www.policy.iastate.edu/electronicprivacy">Privacy Policy</a>
   </li>
   <li class="last leaf">
-    <a href="<?php print $GLOBALS['base_url']; ?>/sitemap" title="Display a site map with RSS feeds."><i class="fa fa-sitemap" aria-hidden="true"></i>Site map</a>
+    <a href="http://digitalaccess.iastate.edu">Digital Access &amp; Accessibility</a>
   </li>
-</ul>
+</ul>
diff --git a/templates/default_region_content_blocks/footer_second.tpl.php b/templates/default_region_content_blocks/footer_second.tpl.php
@@ -1,6 +1,6 @@
-<p><strong>Department of Lorem Ipsum</strong>
-  1234 Street Name
-  Ames IA 50011-1234
-  <a href="mailto:[email protected]">[email protected]</a>
-  515-294-9999 phone
+<p><strong>Department of Lorem Ipsum</strong><br>
+  1234 Street Name<br>
+  Ames IA 50011-1234<br>
+  <a href="mailto:[email protected]">[email protected]</a><br>
+  515-294-9999 phone<br>
   515-294-9999 fax</p>
diff --git a/templates/default_region_content_blocks/footer_third.tpl.php b/templates/default_region_content_blocks/footer_third.tpl.php
@@ -1,12 +1,8 @@
-<p>Copyright &copy; <?php (module_exists('token_filter')) ? print('[current-date:custom:Y]') : print date('Y'); ?>, Iowa State University of Science and Technology. All rights reserved.</p>
 <ul class="menu">
   <li class="first leaf">
-    <a href="http://www.policy.iastate.edu/policy/discrimination">Non-discrimination Policy</a>
-  </li>
-  <li class="leaf">
-    <a href="http://www.policy.iastate.edu/electronicprivacy">Privacy Policy</a>
+    <a href="<?php print $GLOBALS['base_url']; ?>/site-index"><i class="fa fa-list-ul" aria-hidden="true"></i>Site Index</a>
   </li>
   <li class="last leaf">
-    <a href="http://digitalaccess.iastate.edu">Digital Access &amp; Accessibility</a>
+    <a href="<?php print $GLOBALS['base_url']; ?>/sitemap" title="Display a site map with RSS feeds."><i class="fa fa-sitemap" aria-hidden="true"></i>Site map</a>
   </li>
 </ul>
diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php
@@ -4,9 +4,9 @@
 
         <?php if ($show_isu_nameplate): ?>
             <?php if (theme_get_setting('default_logo', 'suitcase_interim')): ?>
-              <a id="isu_header_wordmark" href="<?php ($level_1_url) ? print $level_1_url : 'http://www.iastate.edu' ?>" title="Iowa State University Homepage"><img src="<?php print $wordmark_image; ?>" alt="Iowa State University"></a>
+              <a id="isu_header_wordmark" href="<?php print $level_1_url; ?>" title="Iowa State University Homepage"><img src="<?php print $wordmark_image; ?>" alt="Iowa State University"></a>
             <?php else: ?>
-              <a id="isu_header_wordmark" href="<?php ($level_1_url) ? print $level_1_url : 'http://www.iastate.edu' ?>" title="<?php print $site_name; ?>"><img src="<?php print $wordmark_image; ?>" alt="Iowa State University - <?php print $site_name; ?>"></a>
+              <a id="isu_header_wordmark" href="<?php print $level_1_url; ?>" title="<?php print $site_name; ?>"><img src="<?php print $wordmark_image; ?>" alt="Iowa State University - <?php print $site_name; ?>"></a>
             <?php endif; ?>
         <?php endif; ?>