From faf8290432a82431d464ffc20b2510f31605f47f Mon Sep 17 00:00:00 2001 From: chachasikes <149436+chachasikes@users.noreply.github.com> Date: Tue, 29 Jun 2021 09:27:38 -0700 Subject: [PATCH 1/3] bump plugin number --- ca-design-system-gutenberg-blocks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca-design-system-gutenberg-blocks.php b/ca-design-system-gutenberg-blocks.php index acbb10e..d85c722 100644 --- a/ca-design-system-gutenberg-blocks.php +++ b/ca-design-system-gutenberg-blocks.php @@ -6,7 +6,7 @@ * Description: Gutenberg blocks for CA Design System * Author: Office of Digital Innovation * Author URI: https://digital.ca.gov - * Version: 1.0.10 + * Version: 1.0.11 * License: MIT * License URI: https://opensource.org/licenses/MIT * Text Domain: ca-design-system @@ -22,7 +22,7 @@ } // Constants. -define('CA_DESIGN_SYSTEM_GUTENBERG_BLOCKS__VERSION', '1.0.10'); +define('CA_DESIGN_SYSTEM_GUTENBERG_BLOCKS__VERSION', '1.0.11'); define('CA_DESIGN_SYSTEM_GUTENBERG_BLOCKS__BLOCKS_DIR_PATH', plugin_dir_path(__FILE__)); define('CA_DESIGN_SYSTEM_GUTENBERG_BLOCKS__ADMIN_URL', plugin_dir_url(__FILE__)); define('CA_DESIGN_SYSTEM_GUTENBERG_BLOCKS__FILE', __FILE__); From a1712e7e96625c0da2df10be14529112aa60ba8c Mon Sep 17 00:00:00 2001 From: chachasikes <149436+chachasikes@users.noreply.github.com> Date: Tue, 29 Jun 2021 10:53:32 -0700 Subject: [PATCH 2/3] adjust footer and per page feedback positioning desktop and mobile. remove side padding on back to top --- includes/page-resources.php | 6 +++--- styles/page.css | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/includes/page-resources.php b/includes/page-resources.php index 6a66432..e1924fe 100644 --- a/includes/page-resources.php +++ b/includes/page-resources.php @@ -151,8 +151,8 @@ function cagov_content_menu() // $image_height = $image_meta['height']; // } // echo $org_footer_logo_alt_text -?> -
+ ?> +
@@ -188,7 +188,7 @@ function cagov_content_menu()
- Date: Tue, 29 Jun 2021 11:01:40 -0700 Subject: [PATCH 3/3] mobile alignment and move block spacing css selectors to where they belong in page.css file --- styles/page.css | 205 +++++++++++++++++++++--------------------------- 1 file changed, 91 insertions(+), 114 deletions(-) diff --git a/styles/page.css b/styles/page.css index 0862550..d1937a1 100644 --- a/styles/page.css +++ b/styles/page.css @@ -69,6 +69,85 @@ margin-left: 20px; } + +/* For custom css -- conflicts are back, these overrides set them right, but need to be re-integrated with main markup. */ + +/* Fixing all block spacing */ + +.page-container-ds { + margin: 0 auto; +} + +.single-column { + margin: 0 auto; +} + +/* First Block has a top margin */ +#main-content { + margin-top: 0px; /* Navigation has extra 32px */ + margin-bottom: 32px; +} + +.cagov-block { + margin-bottom: 64px; +} + +/* Reset wp block columns spacing */ +.wp-block-columns { + margin-top: 0px; + margin-bottom: 0 !important; /* Conflict with WP styles & load order */ +} + +.wp-block-column { + margin-top: 0px; + margin-bottom: 0px; +} + +.wp-block-column .cagov-block { + margin-bottom: 64px; +} + +@media (min-width: 992px) { + #main-content.main-content-ds.landing .breadcrumb { + margin-top: 0px; + margin-bottom: 64px !important; /* conflict with divi breadcrumb class*/ + padding-top: 0px !important; + padding-bottom: 0px !important; + } + + #main-content.main-content-ds.single-column .breadcrumb, + .with-sidebar.has-sidebar-left.page-container-ds #main-content.main-content-ds .breadcrumb { + margin-top: 32px; + margin-bottom: 64px !important; /* conflict with divi breadcrumb class*/ + padding-top: 0px !important; + padding-bottom: 0px !important; + } +} + +.cagov-block h2, +.cagov-block h3, +.cagov-block h4, +.cagov-block h6, +.cagov-block h6 { + margin-bottom: 24px; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + padding-bottom: 0 !important; +} + +.wp-block-column h2 { + margin-top: 0; +} + + + + /* BREADCRUMB */ .with-sidebar .main-container-ds { @@ -245,7 +324,6 @@ cagov-content-navigation a { /* Gutenberg Block alignment */ - /* TYPOGRAPHY */ h1.page-title { margin: 0 0 0 0; @@ -289,6 +367,18 @@ main ul li { display: block; } + + /* First Block has a top margin */ + + + .cagov-block { + margin-bottom: 48px; + } + + .wp-block-column .cagov-block { + margin-bottom: 48px; + } + /* BREADCRUMB */ .breadcrumb a.crumb, .breadcrumb span.crumb { @@ -645,8 +735,6 @@ ol.steps li:last-child { border: 1px solid #ededef !important; } -/* TEMPORARY WORKING OVERRIDES, if any */ - .return-top:after { padding-right: 4px; } @@ -678,114 +766,3 @@ article a { text-underline-position: under; } -/* For custom css -- conflicts are back, these overrides set them right, but need to be re-integrated with main markup. */ - -/* Fixing all block spacing */ - -.page-container-ds { - margin: 0 auto; -} - -.single-column { - margin: 0 auto; -} - -/* First Block has a top margin */ -#main-content { - margin-top: 0px; /* Navigation has extra 32px */ - margin-bottom: 32px; -} - -.main-content-ds { - /* margin-bottom: 64px; */ -} - -#main-content.single-column.landing { - /* margin-top: 0px; */ -} - -#main-content.single-column.landing .cagov-block { - /* margin-top: 0px; - margin-bottom: 64px; */ -} - -.cagov-block { - margin-bottom: 64px; -} - -/* Reset wp block columns spacing */ -.wp-block-columns { - margin-top: 0px; - margin-bottom: 0 !important; /* Conflict with WP styles & load order */ -} - -.wp-block-column { - margin-top: 0px; - margin-bottom: 0px; -} - -.wp-block-column .cagov-block { - margin-bottom: 64px; -} - -@media (min-width: 992px) { - #main-content.main-content-ds.landing .breadcrumb { - margin-top: 0px; - margin-bottom: 64px !important; /* conflict with divi breadcrumb class*/ - padding-top: 0px !important; - padding-bottom: 0px !important; - } - - #main-content.main-content-ds.single-column .breadcrumb, - .with-sidebar.has-sidebar-left.page-container-ds #main-content.main-content-ds .breadcrumb { - margin-top: 32px; - margin-bottom: 64px !important; /* conflict with divi breadcrumb class*/ - padding-top: 0px !important; - padding-bottom: 0px !important; - } -} - -.cagov-block h2, -.cagov-block h3, -.cagov-block h4, -.cagov-block h6, -.cagov-block h6 { - margin-bottom: 24px; -} - -/* .cagov-stack h1, -.cagov-stack h2, -.cagov-stack h3, -.cagov-stack h4, -.cagov-card h1, -.cagov-card h2, -.cagov-card h3, -.cagov-card h4 { - margin: 0; -} */ - - -h1, -h2, -h3, -h4, -h5, -h6 { - padding-bottom: 0 !important; -} - -.cagov-stack h1, -.cagov-stack h2, -.cagov-stack h3, -.cagov-stack h4, -.cagov-card h1, -.cagov-card h2, -.cagov-card h3, -.cagov-card h4 { - /* margin-top: 64px; - margin-bottom: 24px; */ -} - -.wp-block-column h2 { - margin-top: 0; -}