Merge branch 'dev' into bug/158

* 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 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 issue where background color classes wouldn't always nest properly #6
CuBoulder · Jun 17, 2019 · ef24f8a · ef24f8a
2 parents 0188a22 + bb79f8a
commit ef24f8a
Show file tree

Hide file tree

Showing 29 changed files with 2,165 additions and 599 deletions.
diff --git a/modules/custom/cu_block_row/css/cu-block-row.css b/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%; }
 

diff --git a/modules/custom/cu_block_row/scss/cu-block-row.scss b/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;
-        }
-      }
     }
   }
 }

diff --git a/modules/custom/cu_section_page_bundle/css/cu-section-page.css b/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; }
 

diff --git a/modules/custom/cu_section_page_bundle/scss/cu-section-page.scss b/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 {

diff --git a/modules/custom/express_permissions/express_permissions.module b/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() {
   }
 
 }
-
diff --git a/modules/features/cu_block_section/css/cu-block-section.css b/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; }

diff --git a/modules/features/cu_block_section/scss/cu-block-section.scss b/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;

diff --git a/tests/behat/behat.travis.yml b/tests/behat/behat.travis.yml
@@ -105,4 +105,4 @@ default:
                 platform: "macOS 10.13"
                 #platform: "Windows 10"
                 # Version of browser to use.
-                #version: "63.0"
+                version: "74.0"
diff --git a/themes/cuivory/css/ivory-styles.css b/themes/cuivory/css/ivory-styles.css
diff --git a/themes/cuivory/scss/ivory-styles.scss b/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 {

diff --git a/themes/cushadow/css/shadow-styles.css b/themes/cushadow/css/shadow-styles.css
diff --git a/themes/cushadow/scss/shadow-styles.scss b/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;

diff --git a/themes/cutradition/css/tradition-styles.css b/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; }
 

diff --git a/themes/cutradition/scss/tradition-styles.scss b/themes/cutradition/scss/tradition-styles.scss
@@ -144,7 +144,7 @@ body {
   padding-bottom: 20px;
 }
 #page-title-wrapper {
-  padding: 20px;
+  padding: 20px 0;
   background-color: #f0f0f0;
 }
 .page-title-image-background-white #page-title-image-wrapper h1 {

diff --git a/themes/ucb/css/elements/buttons.css b/themes/ucb/css/elements/buttons.css