Merge branch 'dev' into abtest-1

* dev:
  Hard coding version of chrome to use with js tests
  fixing type in css that made light page titles the wrong weight #157
  fixing issue where section page content would not align properly on mobile displays #150
  removing extra padding on section pages #150
  fixing horizontal padding issue on shadow theme #151
  adding wider breakpoint for ivory theme #151
  fixing horizontal padding issue on Ivory theme #151
  fixing issue where page title had too much horizontal padding on mobile displays #152
  Update modules/features/cu_home_page/cu_home_page.module
  Adding instructions, adding deprecated label to old fields #3
  fixing issue where blocks were not displaying correctly if set to an match height block row and offset icons #106
  fixing issue where drupal blocs, not beans, could not be configured - such as editing block title #121
  fixing notice if a homepage is set to a path that is not a node #86
  fixing issue where site name had a different line height between front page and other pages #9
  fixing issue where form fields didn't display properly on dark backgrounds #8
  fixing issue where breadcrumbs wouldn't display if a feature image was set #7
  fixing issue where background color classes wouldn't always nest properly #6
  fixing issue where teaser content grid would not display in a column if there wasn't enough text content #4
  adding custom logo to sticky menus, adding .container class to restrict width of sticky menu elements #3

modules/custom/cu_block_row/css/cu-block-row.css

@@ -15,8 +15,7 @@ table.cu-block-row-table-example td { border: 3px solid #fff; }
 @media screen and (min-width: 768px) { .block-row-inner { flex-direction: row; }
   .block-row-match-height { display: flex; flex-direction: row; margin: 0 -20px; }
   .block-row-match-height .block-row-column, .block-row-match-height .block-row-column-inner { display: flex; justify-content: stretch; flex-direction: column; flex-grow: 1; }
-  .block-row-match-height .block-row-column .block:only-child, .block-row-match-height .block-row-column-inner .block:only-child { flex-grow: 1; display: flex; justify-content: stretch; flex-direction: column; }
-  .block-row-match-height .block-row-column .block .block-inner, .block-row-match-height .block-row-column-inner .block .block-inner { flex-grow: 1; display: flex; justify-content: stretch; flex-direction: column; } }
+  .block-row-match-height .block-row-column .block:only-child, .block-row-match-height .block-row-column-inner .block:only-child { flex-grow: 1; display: flex; justify-content: stretch; flex-direction: column; } }
 /* Default Widths */
 .block-row-inner .block-row-column { width: 100%; }
 

modules/custom/cu_block_row/scss/cu-block-row.scss

@@ -25,14 +25,6 @@ table.cu-block-row-table-example {
   flex-direction: column;
   margin:0 -20px;
   flex-wrap: wrap;
-  .block-row-column  {
-    .block {
-
-      .block-inner {
-
-      }
-    }
-  }
 }
 
 @media screen and (min-width:768px) {
@@ -55,15 +47,6 @@ table.cu-block-row-table-example {
         justify-content: stretch;
         flex-direction: column;
       }
-      .block {
-
-        .block-inner {
-          flex-grow:1;
-          display: flex;
-          justify-content: stretch;
-          flex-direction: column;
-        }
-      }
     }
   }
 }

modules/custom/cu_custom_logo_bundle/modules/custom/cu_custom_logo/cu_custom_logo.module

@@ -16,20 +16,23 @@ function cu_custom_logo_menu() {
 }
 
 function cu_custom_logo_upload_form($form, &$form_state) {
+  $form['instructions'] = array(
+    '#type' => 'markup',
+    '#markup' => '<p>Add logo images suitable for light and dark backgrounds. Both images are required for the logo to display.</p>',
+  );
   $form['custom_white_logo'] = array(
     '#type' => 'managed_file',
     '#name' => 'custom_white_logo',
-    '#title' => t('White logo'),
+    '#title' => t('White logo (deprecated)'),
     '#size' => 40,
     '#description' => t('Image should be a transparent png which will be displayed on a dark background. Width should be fewer than 440 pixels. (This field will be removed in a future update).'),
     '#upload_location' => 'public://custom_logo/',
     '#default_value' => variable_get('custom_white_logo', ''),
   );
-
   $form['custom_black_logo'] = array(
     '#type' => 'managed_file',
     '#name' => 'custom_black_logo',
-    '#title' => t('Black logo'),
+    '#title' => t('Black logo (deprecated)'),
     '#size' => 40,
     '#description' => t('Image should be a transparent png which will be displayed on a light background. Width should be fewer than 440 pixels. (This field will be removed in a future update).'),
     '#upload_location' => 'public://custom_logo/',

modules/custom/cu_section_page_bundle/css/cu-section-page.css

@@ -1,4 +1,5 @@
 .node-type-section-page #main { padding-bottom: 0; }
+.node-type-section-page .main-content-wrapper { padding: 0 !important; }
 
 .section-page-sections { position: relative; }
 .section-page-sections .block-section { overflow: hidden; width: 100vw; position: relative; left: 50%; right: 50%; margin-left: -50vw; margin-right: -50vw; display: flex; align-items: center; padding-bottom: 72px; }
@@ -8,9 +9,10 @@
 .section-page-sections .block-section .section-next-wrapper .section-next { display: inline-block; margin: 0 auto; font-size: 48px; }
 @media screen and (min-width: 768px) { .section-page-sections .block-section .section-next-wrapper .section-next { font-size: 64px; } }
 
+.node-type-section-page .main-title-wrapper { padding-top: 20px; }
+.node-type-section-page .section-page-body { padding: 20px 0 0; }
 .node-type-section-page .section-page-hide-title .breadcrumb-wrapper, .node-type-section-page .section-page-hide-title .main-title-wrapper, .node-type-section-page .section-page-hide-title .page-title-wrapper, .node-type-section-page .section-page-hide-title h1.page-title { border: 0; height: 1px !important; overflow: hidden; padding: 0 !important; position: absolute !important; width: 1px !important; white-space: nowrap; }
 .node-type-section-page .section-page-hide-title #main, .node-type-section-page .section-page-hide-title #main-content-wrapper { padding: 0; }
-.node-type-section-page .section-page-hide-title .section-page-body { padding: 20px 0; }
 .node-type-section-page .section-page-hide-title #main .region-content > .block:first-child { margin-top: 20px; }
 .node-type-section-page .post-title-wide-wrapper { padding-bottom: 0; }
 .node-type-section-page .content-wrapper { padding-bottom: 0; }
@@ -46,7 +48,7 @@
 
 .layout-boxed .section-page-section-navigation { width: 100%; position: relative; left: auto; right: auto; margin: 0; }
 .layout-boxed .section-page-navigation-wrapper { margin: 0 -20px; position: relative; left: auto; right: auto; width: auto; background: none; }
-.layout-boxed .section-page-navigation-wrapper.sticky { position: fixed; z-index: 10; top: 0; width: 100%; max-width: 1200px; }
+.layout-boxed .section-page-navigation-wrapper.sticky { position: fixed; z-index: 10; top: 0; width: 100%; max-width: 1500px; }
 .layout-boxed .section-page-sections { position: relative; margin: 0 -20px; }
 .layout-boxed .section-page-sections .block-section { overflow: hidden; width: 100%; position: relative; left: auto; right: auto; margin: 0; }
 

modules/custom/cu_section_page_bundle/scss/cu-section-page.scss

@@ -16,8 +16,13 @@
 
 $cugold: #cfb87c;
 
-.node-type-section-page #main {
-  padding-bottom: 0;
+.node-type-section-page {
+  #main {
+    padding-bottom: 0;
+  }
+  .main-content-wrapper {
+    padding:0 !important;
+  }
 }
 
 .section-page-sections {
@@ -65,7 +70,12 @@ $cugold: #cfb87c;
 }
 
 .node-type-section-page {
-
+  .main-title-wrapper  {
+    padding-top: 20px;
+  }
+  .section-page-body {
+    padding: 20px 0 0;
+  }
   .section-page-hide-title {
     .breadcrumb-wrapper,
     .main-title-wrapper,
@@ -77,9 +87,7 @@ $cugold: #cfb87c;
     #main-content-wrapper {
       padding: 0;
     }
-    .section-page-body {
-      padding: 20px 0;
-    }
+
     #main .region-content > .block:first-child {
       margin-top: 20px;
     }
@@ -254,7 +262,7 @@ $cugold: #cfb87c;
       z-index: 10;
       top:0;
       width:100%;
-      max-width: 1200px;
+      max-width: 1500px;
     }
   }
   .section-page-sections {

modules/custom/cu_sticky_menu/css/cu-sticky-menu.css

@@ -6,6 +6,7 @@
 
 .sticky-menu-site-name { flex-shrink: 1; padding-right: 40px; min-width: 300px; font-family: "Neue Helvetica W05", "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; }
 .sticky-menu-site-name a:link, .sticky-menu-site-name a:visited { color: #fff; }
+.sticky-menu-site-name img { width: 100%; height: auto; max-width: 240px !important; }
 
 .sticky-menu-menu { font-size: 75%; font-weight: bold; }
 .sticky-menu-menu a:link, .sticky-menu-menu a:visited { color: #fff; }

modules/custom/cu_sticky_menu/cu_sticky_menu.module

@@ -40,15 +40,35 @@ function cu_sticky_menu_preprocess_html(&$variables) {
       $site_name = variable_get('site_name', '');
       global $base_url;
       $logo = $base_url . '/' . drupal_get_path('theme', 'ucb') . '/images/cu-boulder-logo-text-white.svg';
-      $variables['page']['page_top']['sticky_menu']['#markup'] = '<div id="sticky-menu" class="clearfix shadow-large">
+
+      // Custom logo.
+      $custom_logo = array();
+      // Load logo files
+      if (variable_get('cu_custom_white_logo', NULL) && variable_get('cu_custom_black_logo', NULL)) {
+        $custom_logo = array(
+          'white' => file_load(variable_get('cu_custom_white_logo')),
+          'black' => file_load(variable_get('cu_custom_black_logo')),
+        );
+        // Create img markup
+        $custom_logo['white']->markup = '<img class="cu-custom-logo custom-logo-white" src="' . file_create_url($custom_logo['white']->uri) . '" alt="' . check_plain($site_name) . ' logo" />';
+        $custom_logo['black']->markup = '<img class="cu-custom-logo custom-logo-black" src="' . file_create_url($custom_logo['black']->uri) . '" alt="' . check_plain($site_name) . ' logo" />';
+        $sticky_site_name = '<a href="' . $base_url . '">' . $custom_logo['white']->markup . '</a>';
+      }
+      else {
+        $sticky_site_name = '<a href="' . $base_url . '"><span class="site-name clearfix">' . strip_tags($site_name) . '</span></a>';
+      }
+
+
+
+      $variables['page']['page_top']['sticky_menu']['#markup'] = '<div id="sticky-menu" class="clearfix shadow-large"><div class="container">
         <img src="' . $logo . '" alt="University of Colorado Boulder"/>
         <div class="sticky-menu-inner">
           <div class="sticky-menu-site-name">
-            <a href="' . $base_url . '"><span class="site-name clearfix">' . strip_tags($site_name) . '</span></a>
+            ' . $sticky_site_name . '
           </div>
           <div class="sticky-menu-menu">' . _cu_sticky_menu_build($menu) . '</div>
         </div>
-      </div>';
+      </div></div>';
   }
 }
 

modules/custom/cu_sticky_menu/scss/cu-sticky-menu.scss

@@ -40,6 +40,11 @@ $cugold: #cfb87c;
   a:visited {
     color:#fff;
   }
+  img {
+    width:100%;
+    height: auto;
+    max-width: 240px !important;
+  }
 }
 .sticky-menu-menu {
   font-size: 75%;

modules/custom/express_layout/express_layout.module

@@ -348,8 +348,8 @@ function express_layout_page_alter(&$page) {
       if (!empty($layout->field_feature_title_image[LANGUAGE_NONE][0]['uri']) && isset($settings['field_feature_title_image'])) {
         // Add node title to variables
         $vars['title'] = $node->title;
-        if (function_exists('expressbase_breadcrumb')) {
-          $vars['breadcrumb'] = expressbase_breadcrumb();
+        if (function_exists('ucb_breadcrumb')) {
+          $vars['breadcrumb'] = ucb_breadcrumb();
         }
         else {
           $vars['breadcrumb'] = NULL;

modules/custom/express_permissions/express_permissions.module

@@ -163,7 +163,7 @@ function express_permissions_secure_permissions($role) {
       'access users overview',
       'access_google_appliance_content',
       'administer beans',
-      // 'administer blocks',
+      'administer blocks',
       'administer checked out documents',
       'administer contexts',
       'administer express settings',
@@ -620,7 +620,7 @@ function express_permissions_secure_permissions($role) {
       'access express settings',
       'access user profiles',
       'administer beans',
-      // 'administer blocks',
+      'administer blocks',
       'administer checked out documents',
       'administer contexts',
       'administer menu',
@@ -698,7 +698,7 @@ function express_permissions_secure_permissions($role) {
       'access user profiles',
       'access users overview',
       'administer beans',
-      // 'administer blocks',
+      'administer blocks',
       'administer checked out documents',
       'administer contexts',
       'administer express settings',
@@ -1153,4 +1153,3 @@ function express_permissions_order_roles() {
   }
 
 }
-

modules/features/cu_block_section/css/cu-block-section.css

@@ -1,4 +1,4 @@
-.block-section { padding: 40px 20px; background-position: center center; background-size: cover; background-repeat: no-repeat; width: 100%; }
+.block-section { padding: 40px 0px; background-position: center center; background-size: cover; background-repeat: no-repeat; width: 100%; }
 
 @media screen and (max-width: 767px) { .block-section.parallax-window { background-attachment: scroll !important; background-position: center center !important; } }
 .block-section-overlay { position: relative; }

modules/features/cu_block_section/scss/cu-block-section.scss

@@ -5,7 +5,7 @@
 }
 
 .block-section {
-  padding: 40px 20px;
+  padding: 40px 0px;
   background-position: center center;
   background-size: cover;
   background-repeat: no-repeat;

modules/features/cu_feature_callout/scss/cu_feature_callout.scss

@@ -143,6 +143,7 @@ $text: #202020;
 .content-grid-style-large_teaser.row,
 .content-grid-style-large_teaser_alt.row {
   margin:0;
+  flex-direction: column;
 }
 
 .content-grid-style-large_teaser_alt {
@@ -435,6 +436,7 @@ $text: #202020;
 }
 .content-grid-style-teaser.row {
   margin:0;
+  flex-direction: column;
 }
 .content-grid-style-teaser {
   @include headers;

modules/features/cu_home_page/cu_home_page.module

@@ -15,9 +15,11 @@ function cu_home_page_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['#node_edit_form']) && ($form['#node_edit_form'] == TRUE)) {
     // Get frontpage variable
     $site_frontpage = variable_get('site_frontpage', 'node');
-    list($first, $second) = explode('/', $site_frontpage, 2);
-    if ($first == 'node' && is_numeric($second) && ($form['nid']['#value'] == $second)) {
-      unset($form['actions']['delete']);
+if (count(explode('/', $site_frontpage, 2)) > 1) {
+      list($first, $second) = explode('/', $site_frontpage, 2);
+      if ($first == 'node' && is_numeric($second) && ($form['nid']['#value'] == $second)) {
+        unset($form['actions']['delete']);
+      }
     }
   }
 }

tests/behat/behat.travis.yml

@@ -108,4 +108,4 @@ default:
                 platform: "macOS 10.13"
                 #platform: "Windows 10"
                 # Version of browser to use.
-                #version: "63.0"
+                version: "74.0"

themes/cuivory/scss/ivory-styles.scss

@@ -11,14 +11,20 @@ body.layout-wide {
   }
 }
 .layout-boxed .page {
-  width:1200px;
+  width:1160px;
   margin: 0 auto;
   @include rgbashadow(0px, 0px, 80px, #000, .25);
   overflow: hidden;
 }
 .layout-responsive.layout-boxed .page {
   width: 100%;
-  max-width: 1200px;
+  max-width: 920px;
+  @media screen and (min-width:1200px) {
+    max-width: 1160px;
+  }
+  @media screen and (min-width:1500px) {
+    max-width: 1500px;
+  }
 }
 
 .banner-black {

themes/cushadow/scss/shadow-styles.scss

@@ -18,13 +18,19 @@ body {
   @include rgbashadow(0,0,80px,#000,.25);
 }
 .layout-fixed .page {
-  width:1500px;
+  width:1160px;
   margin: 0 auto;
 }
 .layout-responsive .page {
   width:auto;
-  max-width: 1200px;
   margin: 0 auto;
+  max-width: 920px;
+  @media screen and (min-width:1200px) {
+    max-width: 1160px;
+  }
+  @media screen and (min-width:1500px) {
+    max-width: 1500px;
+  }
 }
 #secondary-menu-wrapper {
   background-color: #000;

themes/cutradition/css/tradition-styles.css

@@ -43,7 +43,7 @@ body { background-color: #000; padding-bottom: 20px; }
 
 #page-title-image-overlay { padding-bottom: 20px; }
 
-#page-title-wrapper { padding: 20px; background-color: #f0f0f0; }
+#page-title-wrapper { padding: 20px 0; background-color: #f0f0f0; }
 
 .page-title-image-background-white #page-title-image-wrapper h1 { color: #fff; background-color: #424242; }