Merge branch 'development'

css/suitcase.css

@@ -273,8 +273,10 @@ a:hover {
 #section-content .pane-menu-menu-social a.external:after,
 #section-content .block-menu-social a:after,
 #section-content .view-resources a.external:after,
-#section-content .bibio-entry a.external:after {
+#section-content .bibio-entry a.external:after,
+#section-content .flex-caption a.external:after {
     content: '';
+    display: none;
 }
 
 /* -------------------- */
@@ -624,12 +626,32 @@ input[type=submit].form-submit {
     border: 1px solid #ddd;
 }
 
-
 .media-heading { 
     margin-top: 0; 
     margin-bottom: 0;
 }
 
+/* Media Card Layout */
+
+.media.media_card {
+    margin-top: 0.5rem;
+    margin-bottom: 0.5rem;
+    align-items: flex-start;
+}
+
+.media.media_card .media-heading {
+    margin-bottom: 1rem;
+}
+
+.people_media-card_heading {
+    font-size: 1.25rem;
+}
+
+.people_media-card_position {
+    font-size: 1rem;
+    color: #676767;
+}
+
 /* -------------------- */
 /* Icon Menus */
 
@@ -904,21 +926,19 @@ input[type=submit].form-submit {
     transition: all .25s ease;
 }
 
+#isu-menu-nav .sm a:hover,
+#isu-menu-nav .sm a:focus,
+#isu-menu-nav .sm a:active,
+#isu-menu-nav .sm a.highlighted,
 #isu-menu-nav .sm ul a:hover,
 #isu-menu-nav .sm ul a:focus,
 #isu-menu-nav .sm ul a:active,
 #isu-menu-nav .sm ul a.highlighted {
     color: #fff;
-    background: #777;
+    background: #666;
     transition: all 0.25s ease;
 }
 
-#isu-menu-nav .sm ul a:focus,
-#isu-menu-nav .sm ul a:active,
-#isu-menu-nav .sm ul a.highlighted {
-    border: 2px #F1BE48;
-}
-
 #isu-menu-nav #isu-index-menu { float: left; }
 
 #isu-menu-nav #isu-index-menu ul a,
@@ -1375,10 +1395,18 @@ ul.tabs.secondary img {
     border: 1px solid #bbb;
 }
 
-.flex-caption a {
+.flex-caption a,
+.flex-caption a > p {
+    color: #cc0000;
     text-decoration: none;
 }
 
+.flex-caption a:hover,
+.flex-caption a:hover > p {
+    color: #0062a0;
+    text-decoration: underline;
+}
+
 .flex-caption p {
     margin-bottom: 0;
     font-size: 1rem;
@@ -1501,7 +1529,17 @@ in the panel settings */
     margin-bottom: 1rem;
 }
 
-@media (max-width: 1139px) and (min-width: 600px) {
+@media (min-width: 1141px) {
+
+    .megapanels-pane:first-child:nth-last-child(4),
+    .megapanels-pane:first-child:nth-last-child(4) ~ .megapanels-pane {
+      width: calc(25% - 1rem);
+      flex: 0 1 auto;
+      min-width: 0;
+    } 
+}
+
+@media (max-width: 1140px) and (min-width: 600px) {
 
     .megapanels-pane:first-child:nth-last-child(4),
     .megapanels-pane:first-child:nth-last-child(4) ~ .megapanels-pane {
@@ -1510,7 +1548,7 @@ in the panel settings */
     } 
 }
 
-@media (max-width: 829px) and (min-width: 548px) {
+@media (max-width: 1000px) and (min-width: 548px) {
 
     .megapanels-pane:first-child:nth-last-child(3),
     .megapanels-pane:first-child:nth-last-child(3) ~ .megapanels-pane {
@@ -1780,7 +1818,7 @@ aside.region {
     margin: 0 0 1rem 0;
 }
 
-.item-list ul li a {
+.item-list ul > li > a {
     display: block;
 }
 
@@ -2301,9 +2339,32 @@ h2.node-title {
     color: #616161;
 }
 
+.calendar-calendar td .inner div.day a {
+    color: #467CA0;
+}
+
+.calendar-calendar td {
+    color: #676767;
+}
+
 .calendar-calendar td.empty {
     /* Overrides green from module */
-    color: #616161;
+    color: #444444;
+}
+
+.calendar-calendar th.days,
+.calendar-calendar div.date-nav a, .calendar-calendar div.date-nav h3 {
+    color: #000000;
+}
+
+table td.mini.today a {
+    font-weight: bold;
+}
+
+.calendar-calendar tr td.today, 
+.calendar-calendar tr.odd td.today, 
+.calendar-calendar tr.even td.today {
+    background-color: #d8e7ee;
 }
 
 /* --- Month View --- */
@@ -2330,6 +2391,13 @@ h2.node-title {
     background: #006ba6;
 }
 
+.calendar-calendar .month-view .full td.multi-day .inner .monthview .continues, 
+.calendar-calendar .month-view .full td.multi-day .inner .monthview .cutoff,
+.calendar-calendar .week-view .full td.multi-day .inner .weekview .continues, 
+.calendar-calendar .week-view .full td.multi-day .inner .weekview .cutoff {
+    background: #006ba6;
+}
+
 td.multi-day .calendar.monthview a,
 td.multi-day .calendar.weekview a,
 td.multi-day .calendar.dayview a {

panels/layouts/media_card/media-card.tpl.php

@@ -0,0 +1,22 @@
+<div class="media media_card" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <?php if (!empty($content['media_left'])): ?>
+    <div class="media-left">
+      <?php print $content['media_left']; ?>
+    </div>
+  <?php endif; ?>
+
+  <div class="media-body">
+    <?php if (!empty($content['media_heading'])): ?>
+      <div class="media-heading">
+        <?php print $content['media_heading']; ?>
+      </div>
+    <?php endif; ?>
+
+    <?php if (!empty($content['media_body'])): ?>
+      <div class="media-body">
+        <?php print $content['media_body']; ?>
+      </div>
+    <?php endif; ?>
+  </div>
+</div>

panels/layouts/media_card/media_card.inc

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function suitcase_interim_media_card_panels_layouts() {
+  $items['media_card'] = array(
+    'title' => t('Media Card'),
+    'category' => t('Suitcase: Media Card'),
+    'icon' => 'media_card.jpg',
+    'theme' => 'media_card',
+    'admin css' => 'media_card_admin.css',
+    'regions' => array(
+      'media_left' => t('Left'),
+      'media_heading' => t('Heading'),
+      'media_body' => t('Body'),
+    ),
+  );
+  return $items;
+}
+
+

panels/layouts/media_card/media_card_admin.css

@@ -0,0 +1,35 @@
+.media {
+  /* Overrides blog_blog.css */
+  display: flex !important;
+  align-items: center;
+  margin-bottom: 1rem;
+  margin-right: 1rem;
+}
+
+.media.media_card {
+  wdith: 100%;
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+  align-items: flex-start;
+}
+
+.media-left {
+  min-width: 250px;
+  flex: 0 0 auto;
+  margin-right: 1rem;
+  margin-bottom: 0.5rem;
+  padding: 0;
+}
+
+.media-left img {
+  border: 1px solid #ddd;
+}
+
+.media-body {
+  flex-grow: 1;
+}
+
+.media-heading { 
+  margin-top: 0; 
+  margin-bottom: 0;
+}

preprocess/preprocess-block.inc

@@ -0,0 +1,12 @@
+<?php
+
+/*
+ * Implements THEMENAME_alpha_preprocess_block
+ */
+function suitcase_interim_alpha_preprocess_block(&$vars) {
+  // Support aria-labelledby
+  if ($vars['block']->subject) {
+    $vars['title_attributes_array']['id'] = drupal_html_id($vars['block']->subject);
+    $vars['attributes_array']['aria-labelledby'] = $vars['title_attributes_array']['id'];
+  }
+}

preprocess/preprocess-region.inc

@@ -58,7 +58,4 @@ function suitcase_interim_alpha_preprocess_region(&$vars) {
     unset($vars['elements']['#grid']);
     unset($vars['elements']['#grid_container']);
   }
-  elseif (strpos($vars['region'], 'sidebar') === 0) {
-    $vars['attributes_array']['role'] = 'complementary';
-  }
 }

preprocess/preprocess-section.inc

@@ -10,4 +10,7 @@ function suitcase_interim_alpha_preprocess_section(&$vars) {
   if ($vars['elements']['#section'] == 'footer') {
     $vars['attributes_array']['role'] = 'contentinfo';
   }
-}
+  if ($vars['elements']['#section'] == 'content') {
+    $vars['attributes_array']['aria-label'] = 'main content';
+  }
+}

template.php

@@ -363,7 +363,7 @@ function suitcase_interim_menu_link__menu_social($variables) {
   }
 
   if (!empty($font_awesome_icon)) {
-    $element['#title'] = '<i class="fa ' . $font_awesome_icon . '" aria-hidden="true"></i><span class="social-title"> ' . $element['#title'] . '</span>';
+    $element['#title'] = '<span class="fa ' . $font_awesome_icon . '" aria-hidden="true"></span><span class="social-title"> ' . $element['#title'] . '</span>';
     $element['#localized_options']['html'] = TRUE;
   }
 

templates/date-views-pager.tpl.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * @file
+ * Template file for the example display.
+ *
+ * Variables available:
+ *
+ * $plugin: The pager plugin object. This contains the view.
+ *
+ * $plugin->view
+ *   The view object for this navigation.
+ *
+ * $nav_title
+ *   The formatted title for this view. In the case of block
+ *   views, it will be a link to the full view, otherwise it will
+ *   be the formatted name of the year, month, day, or week.
+ *
+ * $prev_url
+ * $next_url
+ *   Urls for the previous and next calendar pages. The links are
+ *   composed in the template to make it easier to change the text,
+ *   add images, etc.
+ *
+ * $prev_options
+ * $next_options
+ *   Query strings and other options for the links that need to
+ *   be used in the l() function, including rel=nofollow.
+ */
+?>
+<?php if (!empty($pager_prefix)) : ?>
+<?php print $pager_prefix; ?>
+<?php endif; ?>
+<div class="date-nav-wrapper clearfix<?php if (!empty($extra_classes)): print $extra_classes; endif; ?>">
+  <div class="date-nav item-list">
+    <div class="date-heading">
+      <h1><?php print $nav_title ?></h1>
+    </div>
+    <ul class="pager">
+    <?php if (!empty($prev_url)) : ?>
+      <li class="date-prev">
+        <?php
+        $text = '&laquo;';
+        $text .= $mini ? '' : ' ' . t('Prev', array(), array('context' => 'date_nav'));
+        print l(t($text), $prev_url, $prev_options);
+        ?>
+      </li>
+    <?php endif; ?>
+    <?php if (!empty($next_url)) : ?>
+      <li class="date-next">
+        <?php print l(($mini ? '' : t('Next', array(), array('context' => 'date_nav')) . ' ') . '&raquo;', $next_url, $next_options); ?>
+      </li>
+    <?php endif; ?>
+    </ul>
+  </div>
+</div>

templates/default_region_content_blocks/footer_third.tpl.php

@@ -1,8 +1,8 @@
 <ul class="menu">
   <li class="first leaf">
-    <a href="<?php print (module_exists('token_filter') ? '[site:url]' : $GLOBALS['base_path']); ?>site-index"><i class="fa fa-list-ul" aria-hidden="true"></i>Site Index</a>
+    <a href="<?php print (module_exists('token_filter') ? '[site:url]' : $GLOBALS['base_path']); ?>site-index"><span class="fa fa-list-ul" aria-hidden="true"></span>Site Index</a>
   </li>
   <li class="last leaf">
-    <a href="<?php print (module_exists('token_filter') ? '[site:url]' : $GLOBALS['base_path']); ?>sitemap" title="Display a site map with RSS feeds."><i class="fa fa-sitemap" aria-hidden="true"></i>Site map</a>
+    <a href="<?php print (module_exists('token_filter') ? '[site:url]' : $GLOBALS['base_path']); ?>sitemap" title="Display a site map with RSS feeds."><span class="fa fa-sitemap" aria-hidden="true"></span>Site map</a>
   </li>
 </ul>

templates/node.tpl.php

@@ -21,8 +21,10 @@
   </div>
 
   <div class="clearfix">
-    <?php if (!empty($content['links'])): ?>
-      <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
+    <?php if (render($content['links'])): ?>
+      <div role="toolbar" class="links node-links clearfix">
+        <?php print render($content['links']); ?>
+      </div>
     <?php endif; ?>
 
     <?php print render($content['comments']); ?>

templates/region--content.tpl.php

@@ -1,4 +1,4 @@
-<main role="main"<?php print $attributes; ?>>
+<main <?php print $attributes; ?>>
   <div<?php print $content_attributes; ?>>
     <a id="main-content"></a>
     <?php print render($title_prefix); ?>