diff --git a/css/suitcase.css b/css/suitcase.css
index 08b9d18..a53e138 100644
--- 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,6 +1345,8 @@ ul.tabs.secondary img {
/* ## HOME
/* ---------------------------------------- */
+.front main.region { margin-top: 0; }
+
/* -------------------- */
/* ## FLEXSLIDER
/* -------------------- */
@@ -1245,6 +1354,7 @@ ul.tabs.secondary img {
.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
index 0169f13..9509828 100644
--- 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);
\ No newline at end of file
+})(jQuery);
diff --git a/templates/default_region_content_blocks/footer_fourth.tpl.php b/templates/default_region_content_blocks/footer_fourth.tpl.php
index 7b62240..6b95fbc 100644
--- a/templates/default_region_content_blocks/footer_fourth.tpl.php
+++ b/templates/default_region_content_blocks/footer_fourth.tpl.php
@@ -1,8 +1,12 @@
+Copyright ©
Iowa State University of Science and Technology. All rights reserved.
\ No newline at end of file
+
diff --git a/templates/default_region_content_blocks/footer_second.tpl.php b/templates/default_region_content_blocks/footer_second.tpl.php
index 4901167..6c7bc7a 100644
--- a/templates/default_region_content_blocks/footer_second.tpl.php
+++ b/templates/default_region_content_blocks/footer_second.tpl.php
@@ -1,6 +1,6 @@
-Department of Lorem Ipsum
- 1234 Street Name
- Ames IA 50011-1234
- ipsum@iastate.edu
- 515-294-9999 phone
+
Department of Lorem Ipsum
+ 1234 Street Name
+ Ames IA 50011-1234
+ ipsum@iastate.edu
+ 515-294-9999 phone
515-294-9999 fax
\ No newline at end of file
diff --git a/templates/default_region_content_blocks/footer_third.tpl.php b/templates/default_region_content_blocks/footer_third.tpl.php
index 2c88b18..d76692d 100644
--- a/templates/default_region_content_blocks/footer_third.tpl.php
+++ b/templates/default_region_content_blocks/footer_third.tpl.php
@@ -1,12 +1,8 @@
-Copyright © , Iowa State University of Science and Technology. All rights reserved.
diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php
index ad22363..d3be6a0 100644
--- a/templates/region--branding.tpl.php
+++ b/templates/region--branding.tpl.php
@@ -4,9 +4,9 @@
-
+
-
+
diff --git a/theme-settings.php b/theme-settings.php
index 632db09..e696e81 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -80,8 +80,8 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state)
$form['suitcase_interim_config']['suitcase_interim_config_logo']['suitcase_interim_config_level_1_url'] = array(
'#type' => 'textfield',
'#title' => t('Wordmark URL'),
- '#description' => t('Full URL the Iowa State University wordmark should link to. Defaults to \'http://www.iastate.edu/\''),
- '#default_value' => variable_get('suitcase_interim_config_level_1_url', 'http://www.iastate.edu/'),
+ '#description' => t('Full URL the Iowa State University wordmark should link to. Defaults to site\'s homepage.'),
+ '#default_value' => variable_get('suitcase_interim_config_level_1_url', $GLOBALS['base_url']),
'#weight' => 2,
);
@@ -193,7 +193,16 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
// Populate empty theme regions with default content blocks if provided
- if (module_exists('block') && filter_format_exists('full_html')) {
+ if (module_exists('block')) {
+
+ if (!filter_format_exists('suitcase_interim_block')) {
+ $suitcase_interim_block_format = array(
+ 'format' => 'suitcase_interim_block',
+ 'name' => 'Suitcase Interim Block',
+ );
+ $suitcase_interim_block_format = (object) $suitcase_interim_block_format;
+ filter_format_save($suitcase_interim_block_format);
+ }
module_load_include('inc', 'block', 'block.admin');
@@ -223,7 +232,7 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
'info' => $block_name,
'body' => array(
'value' => theme_render_template($block_template_file->uri, array()),
- 'format' => 'full_html',
+ 'format' => 'suitcase_interim_block',
),
'regions' => array(
'suitcase_interim' => $region_name,
@@ -255,13 +264,49 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
menu_save($menu);
- $item = array(
- 'link_title' => 'Facebook',
- 'link_path' => 'https://www.facebook.com/',
- 'menu_name' => 'menu-social',
+ $links = array(
+ array(
+ 'link_title' => 'Facebook',
+ 'link_path' => 'https://www.facebook.com/',
+ 'menu_name' => 'menu-social',
+ 'weight' => 0,
+ ),
+ array(
+ 'link_title' => 'Twitter',
+ 'link_path' => 'https://www.twitter.com/',
+ 'menu_name' => 'menu-social',
+ 'weight' => 1,
+ ),
+ array(
+ 'link_title' => 'Instagram',
+ 'link_path' => 'https://www.instagram.com/',
+ 'menu_name' => 'menu-social',
+ 'weight' => 2,
+ ),
+ array(
+ 'link_title' => 'Youtube',
+ 'link_path' => 'https://www.youtube.com/',
+ 'menu_name' => 'menu-social',
+ 'weight' => 3,
+ ),
+ array(
+ 'link_title' => 'RSS',
+ 'link_path' => 'https://en.wikipedia.org/wiki/rss',
+ 'menu_name' => 'menu-social',
+ 'weight' => 4,
+ ),
);
- menu_link_save($item);
+ $item = '';
+ foreach ($links as $link) {
+ $item = array(
+ 'link_path' => $link['link_path'],
+ 'link_title' => $link['link_title'],
+ 'menu_name' => $link['menu_name'],
+ 'weight' => $link['weight'],
+ );
+ menu_link_save($item);
+ }
db_insert('block')->fields(array(
'module' => 'menu',
@@ -269,7 +314,7 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
'theme' => 'suitcase_interim',
'status' => 1,
'weight' => '-28',
- 'region' => 'footer_fourth',
+ 'region' => 'footer_third',
'visibility' => BLOCK_VISIBILITY_NOTLISTED,
'pages' => '',
'title' => '',