diff --git a/404.php b/404.php old mode 100755 new mode 100644 diff --git a/README.md b/README.md index e059b14eb..fbc6ae6b9 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,52 @@ -# Project "Maverick" Review - -### Issues must be logged by July 17 - -Hey team, - -It's time to kick off our formal review of the Maverick theme and report any bugs we discover. Let's make issues on this repository for each bug found. - -[Click here to create an issue →](https://github.com/godaddy/wp-project-maverick/issues/new/choose) - -### Initial Design Review -Rich will focus on design styles and report any discrepancies from the Invision prototypes and all improper styling that needs to be resolved. There are also labels for each design style that we should use to help organize. - -## Functionality Review -Functionality wise, 10Up has created a couple accounts for us to use (I'll send the info in Slack) to test around. You may also download/clone the theme from the [10Up GitLab repo](https://gitlab.10up.com/godaddy/godaddy-theme). They've been using `develop` as the base branch (master) and the `staging` branch autodeploys to godaddy.10uplabs.com. After cloning, run `npm start` to install deps and build all the assets. - -``` -$ git clone git@gitlab.10up.com:godaddy/godaddy-theme.git maverick -$ cd maverick -$ npm start +# A WordPress theme for GoDaddy + +__Description:__ GoDaddy wanted the ability for a single WordPress theme to encompass several design styles (aka moods). This theme uses the Customizer to apply different design styles based on the user's selection. + +Also included within the theme: + +* [TGM Plugin Activation](http://tgmpluginactivation.com/) library - used to help onboard users to install necessary plugin dependencies. Including: + * [WooCommerce](https://wordpress.org/plugins/woocommerce/) plugin + * [CoBlocks](https://wordpress.org/plugins/coblocks/) plugin - Page Builder Gutenberg Blocks + +## Asset organization + +Since we're dealing with mini-themes (aka design styles) within a theme. Here is an overview of the asset organization: + +``` bash +|—— assets/ + |—— admin/ Customizer and WP admin assets + |—— css/ + |—— images/ + |—— js/ + |-- design-styles/ Each Design Style assets + |—— creative-services/ + |—— css/ + |—— fonts/ + |—— images/ + |—— play/ + |—— traditional/ + |—— trendy-shop/ + |—— welcoming/ + |—— shared Global and shared assets + |—— css/ + |—— coblocks/ + |—— components/ + |—— config/ + |—— core-blocks/ + |—— editor/ + |—— elements/ Generic HTML element coverage + |—— layout/ Layout specific + |—— templates/ WordPress template specific + |—— utilities/ + |—— woocommerce/ + |—— editor-style.css Gutenberg editor styles + |—— shared-style.css Imports all of the above + |—— images/ + |—— js/ + |—— frontend/ + |—— components/ + |—— utility/ + |—— vendor/ + |—— frontend.js Imports most of the above + |—— svg/ ``` - -The staging site is a multisite with each design style as its own site. - -## Staging sites -Below you'll find the staging sites for testing the Maverick theme, plus corresponding Invision prototypes of each design style. - -Traditional: -https://godaddy.10uplabs.com/traditional/ -https://10up.invisionapp.com/share/QRRHNIT68UV#/screens/357529448 - -Modern/Creative Services: -https://godaddy.10uplabs.com/creative-services/ -https://10up.invisionapp.com/share/QRRHNIT68UV#/screens/357529442 - -Trendy: -https://godaddy.10uplabs.com/trendy-shop/ -https://10up.invisionapp.com/share/QRRHNIT68UV#/screens/357529454 - -Welcoming: -https://godaddy.10uplabs.com/welcoming/ -https://10up.invisionapp.com/share/QRRHNIT68UV#/screens/357529463 - -Playful: -https://godaddy.10uplabs.com/play/ -https://10up.invisionapp.com/share/QRRHNIT68UV#/screens/360640620 - -## 10Up QA Matrix: -https://docs.google.com/spreadsheets/d/1g2CspmSgOaIdmQ0vnV5wCGs4G23ntsFpIFAY7dm-HMc/edit#gid=791639588 diff --git a/archive.php b/archive.php old mode 100755 new mode 100644 diff --git a/assets/admin/css/customize-controls.css b/assets/admin/css/customize-controls.css old mode 100755 new mode 100644 diff --git a/assets/admin/css/customizer/switcher-control.css b/assets/admin/css/customizer/switcher-control.css old mode 100755 new mode 100644 diff --git a/assets/admin/images/footer-1.svg b/assets/admin/images/footer-1.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/footer-2.svg b/assets/admin/images/footer-2.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/footer-3.svg b/assets/admin/images/footer-3.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/footer-4.svg b/assets/admin/images/footer-4.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-logo-nav-search.svg b/assets/admin/images/header-logo-nav-search.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-logo-nav-vertical.svg b/assets/admin/images/header-logo-nav-vertical.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-nav-logo-search.svg b/assets/admin/images/header-nav-logo-search.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-nav-logo.svg b/assets/admin/images/header-nav-logo.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-search-logo-nav.svg b/assets/admin/images/header-search-logo-nav.svg old mode 100755 new mode 100644 diff --git a/assets/admin/images/header-search-nav-logo.svg b/assets/admin/images/header-search-nav-logo.svg old mode 100755 new mode 100644 diff --git a/assets/admin/js/customize-controls.js b/assets/admin/js/customize-controls.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customize-preview.js b/assets/admin/js/customize-preview.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/controls/switcher-control.js b/assets/admin/js/customizer/controls/switcher-control.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/preview/color-schemes.js b/assets/admin/js/customizer/preview/color-schemes.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/preview/design-style.js b/assets/admin/js/customizer/preview/design-style.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/preview/footer-colors.js b/assets/admin/js/customizer/preview/footer-colors.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/preview/header-colors.js b/assets/admin/js/customizer/preview/header-colors.js old mode 100755 new mode 100644 diff --git a/assets/admin/js/customizer/util.js b/assets/admin/js/customizer/util.js old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/coblocks/carousel.css b/assets/design-styles/creative-services/css/coblocks/carousel.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/coblocks/gallery.css b/assets/design-styles/creative-services/css/coblocks/gallery.css deleted file mode 100755 index 4991ad8a0..000000000 --- a/assets/design-styles/creative-services/css/coblocks/gallery.css +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Creative Services - CoBlocks Gallery styling. - */ - -/** - * 2-col Aign Wide gallery - * ------------------------------ - * | | | - * | Image 1 | Image 2 | - * | | | - * ============================== - * | | | - * | Image 3 | Image 4 | - * | | | - * ------------------------------ - */ -.wp-block-gallery.alignwide.columns-2.is-cropped { - - & > .blocks-gallery-item { - flex: 1 1 28%; - flex-direction: row; - width: auto; - } - - & > .blocks-gallery-item > figure { - width: 100%; - } - - & > li:nth-of-type(3n+1) { - flex: 2 1 70%; - } -} diff --git a/assets/design-styles/creative-services/css/coblocks/hero.css b/assets/design-styles/creative-services/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/coblocks/media-card.css b/assets/design-styles/creative-services/css/coblocks/media-card.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/coblocks/pricing-table.css b/assets/design-styles/creative-services/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/footer/footer-1.css b/assets/design-styles/creative-services/css/components/footer/footer-1.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/header/header-search-logo-nav.css b/assets/design-styles/creative-services/css/components/header/header-search-logo-nav.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/header/primary-menu.css b/assets/design-styles/creative-services/css/components/header/primary-menu.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/header/site-branding.css b/assets/design-styles/creative-services/css/components/header/site-branding.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/header/site-navigation__toggle.css b/assets/design-styles/creative-services/css/components/header/site-navigation__toggle.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/components/header/site-search.css b/assets/design-styles/creative-services/css/components/header/site-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/config/fonts.css b/assets/design-styles/creative-services/css/config/fonts.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/config/settings.css b/assets/design-styles/creative-services/css/config/settings.css old mode 100755 new mode 100644 index 3919d5aa0..970ae50a0 --- a/assets/design-styles/creative-services/css/config/settings.css +++ b/assets/design-styles/creative-services/css/config/settings.css @@ -7,61 +7,115 @@ --THEME-COLOR-PRIMARY: var(--USER-COLOR-PRIMARY, var(--THEME-COLOR-PRIMARY-DEFAULT)); /* Hex: #24252f */ - --THEME-COLOR-SECONDARY-DEFAULT: 235, 13%, 16%; + --THEME-COLOR-SECONDARY-DEFAULT: 0, 0%, 41%; --THEME-COLOR-SECONDARY: var(--USER-COLOR-SECONDARY, var(--THEME-COLOR-SECONDARY-DEFAULT)); + --THEME-COLOR-BODY: 0, 0%, 41%; + --THEME-COLOR-HEADING: 0, 0%, 12%; + --THEME-COLOR-NAV: var(--THEME-COLOR-BODY); + + /* Block spacing. */ + --theme-block-spacing: 1.15rem; + --theme-block-spacing-larger: 1.75rem; + --theme-block-spacing-huge: 4rem; + + @media (--large) { + --theme-block-spacing: 1.75rem; + --theme-block-spacing-larger: 2.3rem; + --theme-block-spacing-huge: 8.5rem; + } + + --theme-block-padding-x: 1rem; + + /* Widths. */ + --theme-max-width-base: 680px; + --theme-max-width-wide: 1280px; + --theme-max-width-full: 1440px; + + /* Page entry header spacing. */ + --theme-entryheader-spacing-top: 4rem; + --theme-entryheader-spacing-bottom: 7rem; + + @media (--large) { + --theme-entryheader-spacing-bottom: 8.5rem; + } + + /* Foooter spacing. */ + --theme-footer-spacing-top: 8.5rem; /* Spacing units. */ --theme-spacing-unit: 0.5rem; --theme-spacing-unit-2: 1rem; + --theme-spacing-unit-3: 1.5rem; --theme-spacing-unit-4: 2rem; --theme-spacing-unit-5: 2.5rem; --theme-spacing-unit-6: 3rem; --theme-spacing-unit-15: 7.5rem; - /* Max widths. */ - --theme-max-width-base: 720px; - --theme-max-width-wide: 1276px; - --theme-max-width-full: 1440px; - /*************************************************************** * TYPOGRAPHY ***************************************************************/ /*
settings */ - --theme-body-font-size: 1.0625rem; - --theme-body-line-height: 2.25em; + --theme-body-font-size: 1rem; + --theme-body-line-height: 1.9em; --theme-body-font-family: "Arimo", sans-serif; /* Headings */ --theme-heading-font-family: "Montserrat", sans-serif; --theme-heading-line-height: var(--line-height-heading); + --theme-heading-content-space-above: 1rem; + --theme-heading-content-space-below: 0; + /* Heading font size */ --theme-h1-font-size: 2.5rem; - --theme-h2-font-size: 2.18rem; + --theme-h2-font-size: 2rem; --theme-h3-font-size: 1.75rem; - --theme-h4-font-size: 1.75rem; - --theme-h5-font-size: 1.5rem; - --theme-h6-font-size: 1.25rem; + --theme-h4-font-size: 1.65rem; + --theme-h5-font-size: 1.35rem; + --theme-h6-font-size: 1.15rem; @media (--large) { - --theme-h1-font-size: 3.5rem; + --theme-h1-font-size: 3.25rem; --theme-h2-font-size: 2.5rem; --theme-h3-font-size: 2rem; + + --theme-heading-content-space-above: 1.5rem; + --theme-heading-content-space-below: -0.375rem; + } + + /* Blockquote */ + --theme-quote-font-size: 1.9rem; + --theme-quote-line-height: 1.36; + --theme-quote-font-weight: 700; + + --theme-quote-large-font-size: 2.25rem; + --theme-quote-large-line-height: 1.3; + --theme-quote-large-font-style: italic; + --theme-quote-large-padding: 0.9rem 0 0 2rem; + --theme-quote-large-cite-margin-left: 1.25rem; + + --theme-quote-large-border-width: 0.45rem; + --theme-quote-large-border-style: solid; + --theme-quote-large-border: var(--theme-quote-large-border-width) var(--theme-quote-large-border-style); + + @media (--large) { + --theme-quote-font-size: 2.15rem; + --theme-quote-large-font-size: 2.75em; } /* Heading colors */ - --theme-h1-color: var(--THEME-COLOR-SECONDARY); - --theme-h2-color: var(--THEME-COLOR-SECONDARY); - --theme-h3-color: var(--THEME-COLOR-SECONDARY); - --theme-h4-color: var(--THEME-COLOR-SECONDARY); - --theme-h5-color: var(--THEME-COLOR-SECONDARY); - --theme-h6-color: var(--THEME-COLOR-SECONDARY); + --theme-h1-color: var(--THEME-COLOR-HEADING); + --theme-h2-color: var(--THEME-COLOR-HEADING); + --theme-h3-color: var(--THEME-COLOR-HEADING); + --theme-h4-color: var(--THEME-COLOR-HEADING); + --theme-h5-color: var(--THEME-COLOR-HEADING); + --theme-h6-color: var(--THEME-COLOR-HEADING); /* Body color */ - --theme-body-color: var(--THEME-COLOR-SECONDARY); - --theme-body-font-color: var(--THEME-COLOR-SECONDARY); + --theme-body-color: var(--THEME-COLOR-BODY); + --theme-body-font-color: var(--THEME-COLOR-BODY); --theme-body-background-color: var(--THEME-COLOR-PRIMARY); /* Links */ @@ -104,8 +158,8 @@ --theme-site-search__toggle-color: var(--THEME-COLOR-SECONDARY); --theme-site-search__toggle-color-interactive: var(--THEME-COLOR-SECONDARY); --theme-site-search__toggle-color-active: var(--THEME-COLOR-SECONDARY); - --theme-site-search__toggle-height: 24px; - --theme-site-search__toggle-width: 24px; + --theme-site-search__toggle-height: 22px; + --theme-site-search__toggle-width: 22px; --theme-site-search__toggle-transition-duration: var(--transition-duration); --theme-site-search__toggle-easing-function: var(--transition-easing-function); --theme-site-search__toggle-spacing-unit: var(--spacing-unit); @@ -113,9 +167,10 @@ --theme-site-search-z-index: 2; /* shared/css/components/header/primary-menu.css */ - --theme-primary-menu-link-color: var(--THEME-COLOR-SECONDARY); + --theme-primary-menu-link-color: var(--THEME-COLOR-BODY); --theme-primary-submenu-bg-color: var(--THEME-COLOR-SECONDARY); --theme-primary-submenu-link-color: var(--THEME-COLOR-SECONDARY); + --theme-primary-menu-link-hover-active-color: 0, 0%, 12%; @media (--large) { --theme-primary-submenu-link-color: var(--THEME-COLOR-PRIMARY); @@ -149,27 +204,27 @@ ***************************************************************/ /* SHARED: Vertical button padding */ - --theme-button-block-vertical-spacing-unit: 1.1rem; + --theme-button-block-vertical-spacing-unit: 1.5rem; /* SHARED: Horizontal button padding */ --theme-button-block-horizontal-spacing-unit: 1.5rem; /* SHARED: Line height */ - --theme-button-block-line-height: 1.125; + --theme-button-block-line-height: 1; /* PRIMARY BUTTON: Font color */ --theme-button-block-color: var(--THEME-COLOR-PRIMARY); /* #fff */ --theme-button-block-color-interactive: var(--THEME-COLOR-PRIMARY); /* #fff */ /* PRIMARY BUTTON: Font size */ - --theme-button-block-font-size: 1.0625rem; + --theme-button-block-font-size: 0.85rem; /* PRIMARY BUTTON: Font weight */ --theme-button-block-font-weight: 700; /* PRIMARY BUTTON: Background color */ - --theme-button-block-background-color: var(--THEME-COLOR-SECONDARY); - --theme-button-block-background-color-interactive: var(--THEME-COLOR-SECONDARY); + --theme-button-block-background-color: var(--THEME-COLOR-HEADING); + --theme-button-block-background-color-interactive: var(--THEME-COLOR-HEADING); /* PRIMARY BUTTON: Border */ --theme-button-block-border: none; @@ -180,10 +235,10 @@ /* PRIMARY BUTTON: Box shadow (use none to remove) */ --theme-button-block-shadow: none; - --theme-button-block-shadow-interactive: 0 0 8px rgba(0, 0, 0, 0.12), 0 0 1px rgba(0, 0, 0, 0.12); + --theme-button-block-shadow-interactive: none; /* PRIMARY BUTTON: Padding */ - --theme-button-block-padding: var(--theme-button-block-vertical-spacing-unit) var(--theme-button-block-horizontal-spacing-unit); + --theme-button-block-padding: var(--theme-button-block-vertical-spacing-unit) var(--theme-button-block-horizontal-spacing-unit) calc(var(--theme-button-block-vertical-spacing-unit) - 1px); /* PRIMARY BUTTON: Text decoration */ --theme-button-block-text-decoration: none; @@ -275,13 +330,6 @@ --theme-image-caption-text-color: var(--THEME-COLOR-SECONDARY); --theme-block-separator-color: var(--THEME-COLOR-SECONDARY); - --theme-quote-font-size: 1.9rem; - - @media (--large) { - --theme-quote-font-size: 2.15rem; - --theme-quote-large-font-size: 2.75rem; - } - /*************************************************************** * CoBlocks blocks ***************************************************************/ @@ -344,9 +392,9 @@ /* Textarea */ --theme-textarea-color: var(--THEME-COLOR-SECONDARY); - --theme-textarea-stroke-color: 210, 6%, 63%; /* #9aa0a6 */ - --theme-textarea-color-focus: 225, 6%, 13%; /* #202124 */ - --theme-textarea-stroke-color-focus: 225, 6%, 13%; /* #202124 */ + --theme-textarea-stroke-color: var(--THEME-COLOR-SECONDARY); + --theme-textarea-color-focus: var(--THEME-COLOR-SECONDARY); + --theme-textarea-stroke-color-focus: var(--THEME-COLOR-SECONDARY); --theme-textarea-color-background: 0, 0%, 100%; /* #fff */ /* Check and Radio SVG trick */ diff --git a/assets/design-styles/creative-services/css/core-blocks/button.css b/assets/design-styles/creative-services/css/core-blocks/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/creative-services.css b/assets/design-styles/creative-services/css/creative-services.css old mode 100755 new mode 100644 index cc77e2826..1333a2ee3 --- a/assets/design-styles/creative-services/css/creative-services.css +++ b/assets/design-styles/creative-services/css/creative-services.css @@ -17,7 +17,6 @@ /* CoBlocks customizations */ @import url("coblocks/carousel.css"); -@import url("coblocks/gallery.css"); @import url("coblocks/hero.css"); @import url("coblocks/media-card.css"); @import url("coblocks/pricing-table.css"); diff --git a/assets/design-styles/creative-services/css/editor-style.css b/assets/design-styles/creative-services/css/editor-style.css index 14797e021..64d42b846 100755 --- a/assets/design-styles/creative-services/css/editor-style.css +++ b/assets/design-styles/creative-services/css/editor-style.css @@ -16,7 +16,6 @@ /* CoBlocks customizations */ @import url("coblocks/carousel.css"); -@import url("coblocks/gallery.css"); @import url("coblocks/hero.css"); @import url("coblocks/media-card.css"); @import url("coblocks/pricing-table.css"); diff --git a/assets/design-styles/creative-services/css/elements/forms.css b/assets/design-styles/creative-services/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/elements/headings.css b/assets/design-styles/creative-services/css/elements/headings.css old mode 100755 new mode 100644 index 6bac3f293..c9bdbcf6c --- a/assets/design-styles/creative-services/css/elements/headings.css +++ b/assets/design-styles/creative-services/css/elements/headings.css @@ -8,9 +8,7 @@ h2 { } h3 { - font-weight: 400; - letter-spacing: 1px; - line-height: 1.36; + letter-spacing: -0.01em; } h4 { diff --git a/assets/design-styles/creative-services/css/elements/site-search.css b/assets/design-styles/creative-services/css/elements/site-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/templates/post.css b/assets/design-styles/creative-services/css/templates/post.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/woocommerce/button.css b/assets/design-styles/creative-services/css/woocommerce/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/css/woocommerce/shop.css b/assets/design-styles/creative-services/css/woocommerce/shop.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/images/placeholder-logo.svg b/assets/design-styles/creative-services/images/placeholder-logo.svg old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/svg/arrow-right.svg b/assets/design-styles/creative-services/svg/arrow-right.svg old mode 100755 new mode 100644 diff --git a/assets/design-styles/creative-services/svg/search.svg b/assets/design-styles/creative-services/svg/search.svg old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/coblocks/author.css b/assets/design-styles/play/css/coblocks/author.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/coblocks/carousel.css b/assets/design-styles/play/css/coblocks/carousel.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/coblocks/hero.css b/assets/design-styles/play/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/coblocks/media-card.css b/assets/design-styles/play/css/coblocks/media-card.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/coblocks/pricing-table.css b/assets/design-styles/play/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/custom-logo.css b/assets/design-styles/play/css/components/custom-logo.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/footer/footer-4.css b/assets/design-styles/play/css/components/footer/footer-4.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/footer/site-footer.css b/assets/design-styles/play/css/components/footer/site-footer.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/header/has-offscreen-nav.css b/assets/design-styles/play/css/components/header/has-offscreen-nav.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/header/header-nav-logo-search.css b/assets/design-styles/play/css/components/header/header-nav-logo-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/header/header-search-logo-nav.css b/assets/design-styles/play/css/components/header/header-search-logo-nav.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/components/header/primary-menu.css b/assets/design-styles/play/css/components/header/primary-menu.css new file mode 100644 index 000000000..257275545 --- /dev/null +++ b/assets/design-styles/play/css/components/header/primary-menu.css @@ -0,0 +1,20 @@ +/** + * Play - Primary Menu + */ +.primary-menu { + --border-start: 18px; + --border-end-mobile: 22px; + --border-end-desktop: 24px; + + /* A toggling parent item with children */ + & .menu-item-has-children { + + /* Add a small ddown arrow */ + & > [aria-haspopup] { + + &::after { + background-image: url("../../../dist/shared/svg/arrow-down-white.svg"); + } + } + } +} diff --git a/assets/design-styles/play/css/components/header/site-branding.css b/assets/design-styles/play/css/components/header/site-branding.css new file mode 100644 index 000000000..7e849336b --- /dev/null +++ b/assets/design-styles/play/css/components/header/site-branding.css @@ -0,0 +1,3 @@ +/** + * Creative Services - Side branding + */ diff --git a/assets/design-styles/play/css/components/header/site-header.css b/assets/design-styles/play/css/components/header/site-header.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/config/fonts.css b/assets/design-styles/play/css/config/fonts.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/config/settings.css b/assets/design-styles/play/css/config/settings.css old mode 100755 new mode 100644 index c07ca0558..953a2c852 --- a/assets/design-styles/play/css/config/settings.css +++ b/assets/design-styles/play/css/config/settings.css @@ -125,7 +125,6 @@ --theme-primary-menu-link-color: var(--color-white); --theme-primary-submenu-bg-color: var(--color-shark); --theme-primary-submenu-link-color: var(--color-white); - --theme-primary-menu-link-hover-active-color: var(--color-white); --theme-site-header-background-color: var(--THEME-COLOR-PRIMARY); --theme-site-footer-background-color: var(--THEME-COLOR-PRIMARY); diff --git a/assets/design-styles/play/css/elements/blockquotes.css b/assets/design-styles/play/css/elements/blockquotes.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/elements/forms.css b/assets/design-styles/play/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/elements/headings.css b/assets/design-styles/play/css/elements/headings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/elements/hr.css b/assets/design-styles/play/css/elements/hr.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/elements/links.css b/assets/design-styles/play/css/elements/links.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/css/play.css b/assets/design-styles/play/css/play.css old mode 100755 new mode 100644 index 23e876000..6755aadba --- a/assets/design-styles/play/css/play.css +++ b/assets/design-styles/play/css/play.css @@ -15,6 +15,8 @@ @import url("elements/hr.css"); /* Components - everything that is NOT a block */ +@import url("components/header/primary-menu.css"); +@import url("components/header/site-branding.css"); @import url("components/header/has-offscreen-nav.css"); @import url("components/header/header-nav-logo-search.css"); @import url("components/header/header-search-logo-nav.css"); diff --git a/assets/design-styles/play/css/utilities/colorize.css b/assets/design-styles/play/css/utilities/colorize.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/images/squiggle.png b/assets/design-styles/play/images/squiggle.png old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/svg/cross-stich-border.svg b/assets/design-styles/play/svg/cross-stich-border.svg old mode 100755 new mode 100644 diff --git a/assets/design-styles/play/svg/icon-carousel.svg b/assets/design-styles/play/svg/icon-carousel.svg old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/author.css b/assets/design-styles/traditional/css/coblocks/author.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/carousel.css b/assets/design-styles/traditional/css/coblocks/carousel.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/hero.css b/assets/design-styles/traditional/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/media-card.css b/assets/design-styles/traditional/css/coblocks/media-card.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/media.css b/assets/design-styles/traditional/css/coblocks/media.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/pricing-table.css b/assets/design-styles/traditional/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/row.css b/assets/design-styles/traditional/css/coblocks/row.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/coblocks/separator.css b/assets/design-styles/traditional/css/coblocks/separator.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/footer/footer-2.css b/assets/design-styles/traditional/css/components/footer/footer-2.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/header-logo-nav-search.css b/assets/design-styles/traditional/css/components/header/header-logo-nav-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/header-nav-logo-search.css b/assets/design-styles/traditional/css/components/header/header-nav-logo-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/header-search-logo-nav.css b/assets/design-styles/traditional/css/components/header/header-search-logo-nav.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/primary-menu.css b/assets/design-styles/traditional/css/components/header/primary-menu.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/site-search.css b/assets/design-styles/traditional/css/components/header/site-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/components/header/site-search__toggle.css b/assets/design-styles/traditional/css/components/header/site-search__toggle.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/config/fonts.css b/assets/design-styles/traditional/css/config/fonts.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/config/settings.css b/assets/design-styles/traditional/css/config/settings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/elements/forms.css b/assets/design-styles/traditional/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/elements/headings.css b/assets/design-styles/traditional/css/elements/headings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/gravity/forms.css b/assets/design-styles/traditional/css/gravity/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/templates/post.css b/assets/design-styles/traditional/css/templates/post.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/traditional.css b/assets/design-styles/traditional/css/traditional.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/woocommerce/forms.css b/assets/design-styles/traditional/css/woocommerce/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/traditional/css/woocommerce/shop.css b/assets/design-styles/traditional/css/woocommerce/shop.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/coblocks/author.css b/assets/design-styles/trendy-shop/css/coblocks/author.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/coblocks/carousel.css b/assets/design-styles/trendy-shop/css/coblocks/carousel.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/coblocks/hero.css b/assets/design-styles/trendy-shop/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/coblocks/media-card.css b/assets/design-styles/trendy-shop/css/coblocks/media-card.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/coblocks/pricing-table.css b/assets/design-styles/trendy-shop/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/components/footer/footer-3.css b/assets/design-styles/trendy-shop/css/components/footer/footer-3.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/components/header/header-nav-logo-search.css b/assets/design-styles/trendy-shop/css/components/header/header-nav-logo-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/components/header/primary-menu.css b/assets/design-styles/trendy-shop/css/components/header/primary-menu.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/components/header/site-branding.css b/assets/design-styles/trendy-shop/css/components/header/site-branding.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/components/header/site-navigation__toggle.css b/assets/design-styles/trendy-shop/css/components/header/site-navigation__toggle.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/config/fonts.css b/assets/design-styles/trendy-shop/css/config/fonts.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/config/settings.css b/assets/design-styles/trendy-shop/css/config/settings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/core-blocks/button.css b/assets/design-styles/trendy-shop/css/core-blocks/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/elements/forms.css b/assets/design-styles/trendy-shop/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/elements/headings.css b/assets/design-styles/trendy-shop/css/elements/headings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/elements/site-search.css b/assets/design-styles/trendy-shop/css/elements/site-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/elements/tables.css b/assets/design-styles/trendy-shop/css/elements/tables.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/trendy-shop.css b/assets/design-styles/trendy-shop/css/trendy-shop.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/woocommerce/button.css b/assets/design-styles/trendy-shop/css/woocommerce/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/trendy-shop/css/woocommerce/shop.css b/assets/design-styles/trendy-shop/css/woocommerce/shop.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/author.css b/assets/design-styles/welcoming/css/coblocks/author.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/carousel.css b/assets/design-styles/welcoming/css/coblocks/carousel.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/hero.css b/assets/design-styles/welcoming/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/media-card.css b/assets/design-styles/welcoming/css/coblocks/media-card.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/media.css b/assets/design-styles/welcoming/css/coblocks/media.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/pricing-table.css b/assets/design-styles/welcoming/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/coblocks/row.css b/assets/design-styles/welcoming/css/coblocks/row.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/comments.css b/assets/design-styles/welcoming/css/components/comments.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/custom-logo.css b/assets/design-styles/welcoming/css/components/custom-logo.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/footer/footer-4.css b/assets/design-styles/welcoming/css/components/footer/footer-4.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/header/header-nav-logo-search.css b/assets/design-styles/welcoming/css/components/header/header-nav-logo-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/header/primary-menu.css b/assets/design-styles/welcoming/css/components/header/primary-menu.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/header/site-branding.css b/assets/design-styles/welcoming/css/components/header/site-branding.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/components/header/site-search.css b/assets/design-styles/welcoming/css/components/header/site-search.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/config/fonts.css b/assets/design-styles/welcoming/css/config/fonts.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/config/settings.css b/assets/design-styles/welcoming/css/config/settings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/core-blocks/button.css b/assets/design-styles/welcoming/css/core-blocks/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/elements/forms.css b/assets/design-styles/welcoming/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/elements/headings.css b/assets/design-styles/welcoming/css/elements/headings.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/gravity/button.css b/assets/design-styles/welcoming/css/gravity/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/welcoming.css b/assets/design-styles/welcoming/css/welcoming.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/css/woocommerce/button.css b/assets/design-styles/welcoming/css/woocommerce/button.css old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/images/hero-bg-pattern.png b/assets/design-styles/welcoming/images/hero-bg-pattern.png old mode 100755 new mode 100644 diff --git a/assets/design-styles/welcoming/svg/arrow-right.svg b/assets/design-styles/welcoming/svg/arrow-right.svg old mode 100755 new mode 100644 diff --git a/assets/shared/css/coblocks/author.css b/assets/shared/css/coblocks/author.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/coblocks/hero.css b/assets/shared/css/coblocks/hero.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/coblocks/pricing-table.css b/assets/shared/css/coblocks/pricing-table.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/coblocks/row.css b/assets/shared/css/coblocks/row.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/buttons.css b/assets/shared/css/components/buttons.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/comments.css b/assets/shared/css/components/comments.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/footer/footer-1.css b/assets/shared/css/components/footer/footer-1.css old mode 100755 new mode 100644 index 213d558bc..33b3113f2 --- a/assets/shared/css/components/footer/footer-1.css +++ b/assets/shared/css/components/footer/footer-1.css @@ -8,7 +8,6 @@ @media (--large) { padding-bottom: calc(2 * var(--theme-spacing-unit-6)); - padding-top: calc(6.2 * var(--theme-spacing-unit-4)); } /* Social icons */ @@ -69,7 +68,6 @@ /* Copyright text */ & .footer-copy-text { - color: hsla(var(--theme-footer-1-text-color), 0.3); font-size: 0.9375rem; } } diff --git a/assets/shared/css/components/footer/footer-2.css b/assets/shared/css/components/footer/footer-2.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/footer/footer-3.css b/assets/shared/css/components/footer/footer-3.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/footer/footer-4.css b/assets/shared/css/components/footer/footer-4.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/footer/site-footer.css b/assets/shared/css/components/footer/site-footer.css old mode 100755 new mode 100644 index 790d51b02..ea5bcc190 --- a/assets/shared/css/components/footer/site-footer.css +++ b/assets/shared/css/components/footer/site-footer.css @@ -1,5 +1,5 @@ .site-footer { - padding: var(--theme-spacing-unit-6) var(--theme-spacing-unit-2); + padding-top: var(--theme-footer-spacing-top); position: relative; @media (--full-width) { @@ -11,4 +11,18 @@ display: inline-block; padding: 0.3rem 0.5rem; } + + & .footer-copy-text { + color: hsla(var(--THEME-COLOR-NAV), 1); + } + + & a { + color: hsla(var(--THEME-COLOR-NAV), 1); + + &:active, + &:focus, + &:hover { + color: hsla(var(--theme-footer-1-link-color-interactive), 0.8); + } + } } diff --git a/assets/shared/css/components/footer/social-icons.css b/assets/shared/css/components/footer/social-icons.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/has-offscreen-nav.css b/assets/shared/css/components/header/has-offscreen-nav.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/header-logo-nav-search.css b/assets/shared/css/components/header/header-logo-nav-search.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/header-logo-nav-vert.css b/assets/shared/css/components/header/header-logo-nav-vert.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/header-nav-logo-search.css b/assets/shared/css/components/header/header-nav-logo-search.css old mode 100755 new mode 100644 index b5d195f04..7bfe920b6 --- a/assets/shared/css/components/header/header-nav-logo-search.css +++ b/assets/shared/css/components/header/header-nav-logo-search.css @@ -42,7 +42,6 @@ background-color: hsl(var(--theme-site-navigation__toggle-background-color)); display: block; height: 70px; - left: 0; position: absolute; right: 0; top: 0; @@ -83,10 +82,6 @@ } } -.menu-is-open .site-header--nav-logo-search .site-navigation__toggle { - left: auto; -} - /* Once the menu is open, we reset the positioning on the menu in order to have it appear in place. This is done to counter the fix that follows diff --git a/assets/shared/css/components/header/header-nav-logo.css b/assets/shared/css/components/header/header-nav-logo.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/header-search-logo-nav.css b/assets/shared/css/components/header/header-search-logo-nav.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/is-header-nav-logo-search.css b/assets/shared/css/components/header/is-header-nav-logo-search.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/is-header-search-logo-nav.css b/assets/shared/css/components/header/is-header-search-logo-nav.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/primary-menu.css b/assets/shared/css/components/header/primary-menu.css old mode 100755 new mode 100644 index 8ec5c66ca..eb7bdff59 --- a/assets/shared/css/components/header/primary-menu.css +++ b/assets/shared/css/components/header/primary-menu.css @@ -25,10 +25,8 @@ /* All menu links */ & a { border: none; - color: hsla(var(--theme-primary-menu-link-color), 1); + color: hsla(var(--THEME-COLOR-NAV), 1); display: inline-block; - padding-bottom: calc(2 * var(--theme-spacing-unit)); - padding-top: calc(2 * var(--theme-spacing-unit)); position: relative; text-decoration: none; transition: opacity 0.2s ease; @@ -172,15 +170,9 @@ &:hover, &.child-has-focus { - & > a::after { - transform: rotate(180deg); - } - & > .sub-menu { @media (--large) { - display: block !important; - opacity: 1; - visibility: visible; + display: block; } } } diff --git a/assets/shared/css/components/header/site-branding.css b/assets/shared/css/components/header/site-branding.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/site-header.css b/assets/shared/css/components/header/site-header.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/site-navigation.css b/assets/shared/css/components/header/site-navigation.css old mode 100755 new mode 100644 index cda85f9d5..0ca62b521 --- a/assets/shared/css/components/header/site-navigation.css +++ b/assets/shared/css/components/header/site-navigation.css @@ -32,7 +32,7 @@ width: auto; } - & .primary-menu [aria-hidden="true"] { + & .primary-menu [aria-hidden="true"]:not(:hover) { display: none !important; opacity: 0; visibility: hidden; diff --git a/assets/shared/css/components/header/site-navigation__toggle.css b/assets/shared/css/components/header/site-navigation__toggle.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/site-search.css b/assets/shared/css/components/header/site-search.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/header/site-search__toggle.css b/assets/shared/css/components/header/site-search__toggle.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/components/posts-navigation.css b/assets/shared/css/components/posts-navigation.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/animations.css b/assets/shared/css/config/animations.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/borders.css b/assets/shared/css/config/borders.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/colors-global.css b/assets/shared/css/config/colors-global.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/layout.css b/assets/shared/css/config/layout.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/media-queries.css b/assets/shared/css/config/media-queries.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/mixins.css b/assets/shared/css/config/mixins.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/typography.css b/assets/shared/css/config/typography.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/config/z-index.css b/assets/shared/css/config/z-index.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/button.css b/assets/shared/css/core-blocks/button.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/columns.css b/assets/shared/css/core-blocks/columns.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/cover.css b/assets/shared/css/core-blocks/cover.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/file.css b/assets/shared/css/core-blocks/file.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/gallery.css b/assets/shared/css/core-blocks/gallery.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/image.css b/assets/shared/css/core-blocks/image.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/latest-comments.css b/assets/shared/css/core-blocks/latest-comments.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/latest-posts.css b/assets/shared/css/core-blocks/latest-posts.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/media.css b/assets/shared/css/core-blocks/media.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/preformatted.css b/assets/shared/css/core-blocks/preformatted.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/pullquote.css b/assets/shared/css/core-blocks/pullquote.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/core-blocks/quote.css b/assets/shared/css/core-blocks/quote.css old mode 100755 new mode 100644 index f0e59d965..ef18b7694 --- a/assets/shared/css/core-blocks/quote.css +++ b/assets/shared/css/core-blocks/quote.css @@ -2,12 +2,12 @@ border: none; color: hsl(var(--theme-h2-color)); font-family: var(--theme-heading-font-family); - font-weight: var(--theme-quote-font-weight, 700); + font-weight: var(--theme-quote-font-weight); padding: 0; & p { - font-size: var(--theme-quote-font-size, 1.9rem); - line-height: var(--theme-quote-line-height, 1.36); + font-size: var(--theme-quote-font-size); + line-height: var(--theme-quote-line-height); margin: 0 0 0 1.5rem; position: relative; diff --git a/assets/shared/css/core-blocks/separator.css b/assets/shared/css/core-blocks/separator.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/editor/page.css b/assets/shared/css/editor/page.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/buttons.css b/assets/shared/css/elements/buttons.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/forms.css b/assets/shared/css/elements/forms.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/headings.css b/assets/shared/css/elements/headings.css old mode 100755 new mode 100644 index 7b2a6cb2e..65e28d3fb --- a/assets/shared/css/elements/headings.css +++ b/assets/shared/css/elements/headings.css @@ -8,10 +8,8 @@ h3, h4, h5, h6 { - clear: both; font-family: var(--theme-heading-font-family); line-height: var(--theme-heading-line-height); - margin: var(--theme-spacing-unit-2) 0; } h1 { diff --git a/assets/shared/css/elements/links.css b/assets/shared/css/elements/links.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/lists.css b/assets/shared/css/elements/lists.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/media.css b/assets/shared/css/elements/media.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/page.css b/assets/shared/css/elements/page.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/elements/tables.css b/assets/shared/css/elements/tables.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/gravity/button.css b/assets/shared/css/gravity/button.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/gravity/checkbox.css b/assets/shared/css/gravity/checkbox.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/gravity/forms.css b/assets/shared/css/gravity/forms.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/gravity/radio.css b/assets/shared/css/gravity/radio.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/layout/content.css b/assets/shared/css/layout/content.css old mode 100755 new mode 100644 index a9dd7f8c7..8cb045679 --- a/assets/shared/css/layout/content.css +++ b/assets/shared/css/layout/content.css @@ -1,12 +1,11 @@ .content-area > * { - margin: var(--theme-spacing-unit-2) auto; + margin: var(--theme-block-spacing) auto; max-width: var(--theme-max-width-base); - padding-left: var(--theme-spacing-unit-2); - padding-right: var(--theme-spacing-unit-2); + padding-left: var(--theme-block-padding-x); + padding-right: var(--theme-block-padding-x); - @media (--medium) { - margin-bottom: calc(2 * var(--theme-spacing-unit-2)); - margin-top: calc(2 * var(--theme-spacing-unit-2)); + &:not(p):not(ul):not(ol):not(.wp-block-spacer) { + margin: var(--theme-block-spacing-huge) auto; } &:first-child { @@ -17,9 +16,15 @@ margin-bottom: 0 !important; } + & > *:first-child { + margin-top: 0; + } + + & > *:last-child { + margin-bottom: 0; + } + &.alignwide { - margin-left: auto; - margin-right: auto; max-width: var(--theme-max-width-wide); } @@ -30,42 +35,41 @@ } } -.content-area > h1 + p, -.content-area > h2 + p, -.content-area > h3 + p, -.content-area > h4 + p, -.content-area > h5 + p, -.content-area > h6 + p -.content-area > h1 + .wp-block-button, -.content-area > h2 + .wp-block-button, -.content-area > h3 + .wp-block-button, -.content-area > h4 + .wp-block-button, -.content-area > h5 + .wp-block-button, -.content-area > h6 + .wp-block-button { - margin-top: 0; -} +.content-area { + + & h1, + & h2, + & h3, + & h4, + & h5, + & h6 { -.content-area > p { - margin-bottom: var(--theme-spacing-unit-2); + & + p { + margin-top: calc(-0.8 * var(--theme-block-spacing-huge)) !important; + } - & + p { - margin-top: var(--theme-spacing-unit); + & + .wp-block-button { + margin-top: calc(-0.65 * var(--theme-block-spacing-huge)) !important; + } } -} -.content-area > .wp-block-separator, -.content-area > hr { - margin-bottom: var(--theme-spacing-unit-6); - margin-top: var(--theme-spacing-unit-6); -} + & p ~ { -.content-area > .wp-block-image, -.content-area > .wp-block-coblocks-row { - margin-bottom: calc(3.25 * var(--theme-spacing-unit-2)); - margin-top: calc(3.25 * var(--theme-spacing-unit-2)); + & h1, + & h2, + & h3, + & h4, + & h5, + & h6 { + margin-bottom: 0 !important; + margin-top: var(--theme-block-spacing-larger) !important; + padding-top: 2rem; + } - @media (--medium) { - margin-bottom: calc(7.5 * var(--theme-spacing-unit-2)); - margin-top: calc(7.5 * var(--theme-spacing-unit-2)); + & figure, + & blockquote { + margin-bottom: var(--theme-block-spacing-larger) !important; + margin-top: var(--theme-block-spacing-larger) !important; + } } } diff --git a/assets/shared/css/layout/entry-header.css b/assets/shared/css/layout/entry-header.css old mode 100755 new mode 100644 index e9e24ba3a..b66ac5aa2 --- a/assets/shared/css/layout/entry-header.css +++ b/assets/shared/css/layout/entry-header.css @@ -1,8 +1,8 @@ .entry-header { - margin: var(--theme-spacing-unit-6) auto var(--theme-spacing-unit-4); + margin: var(--theme-entryheader-spacing-top) auto var(--theme-entryheader-spacing-bottom); max-width: var(--theme-max-width-base); - & .entry-title { + & .post__title { text-align: center; } } diff --git a/assets/shared/css/layout/page.css b/assets/shared/css/layout/page.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/templates/blog.css b/assets/shared/css/templates/blog.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/templates/post.css b/assets/shared/css/templates/post.css old mode 100755 new mode 100644 index 26b52b7ca..a7caf3b61 --- a/assets/shared/css/templates/post.css +++ b/assets/shared/css/templates/post.css @@ -15,7 +15,7 @@ } } -.entry-title { +.post__title { margin: 0; } @@ -24,7 +24,7 @@ } /* Archive loop */ -.hentry { +.post--archive { margin: 0 0 4rem; & a { diff --git a/assets/shared/css/utilities/accessibility.css b/assets/shared/css/utilities/accessibility.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/utilities/captions.css b/assets/shared/css/utilities/captions.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/utilities/colorize.css b/assets/shared/css/utilities/colorize.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/utilities/feedback.css b/assets/shared/css/utilities/feedback.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/utilities/layout.css b/assets/shared/css/utilities/layout.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/utilities/wordpress.css b/assets/shared/css/utilities/wordpress.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/button.css b/assets/shared/css/woocommerce/button.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/cart.css b/assets/shared/css/woocommerce/cart.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/checkbox.css b/assets/shared/css/woocommerce/checkbox.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/forms.css b/assets/shared/css/woocommerce/forms.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/layout.css b/assets/shared/css/woocommerce/layout.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/pagination.css b/assets/shared/css/woocommerce/pagination.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/product.css b/assets/shared/css/woocommerce/product.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/shop.css b/assets/shared/css/woocommerce/shop.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/tabs.css b/assets/shared/css/woocommerce/tabs.css old mode 100755 new mode 100644 diff --git a/assets/shared/css/woocommerce/typography.css b/assets/shared/css/woocommerce/typography.css old mode 100755 new mode 100644 diff --git a/assets/shared/js/frontend/components/blockquote-colorize.js b/assets/shared/js/frontend/components/blockquote-colorize.js old mode 100755 new mode 100644 diff --git a/assets/shared/js/frontend/components/primary-menu.js b/assets/shared/js/frontend/components/primary-menu.js old mode 100755 new mode 100644 index 3581453d2..f9e4c5513 --- a/assets/shared/js/frontend/components/primary-menu.js +++ b/assets/shared/js/frontend/components/primary-menu.js @@ -8,7 +8,9 @@ const init = () => { if ( TenUp ) { TenUp.navigation( { target: '#js-primary-menu', - toggle: '#js-site-navigation__toggle' + toggle: '#js-site-navigation__toggle', + // eslint-disable-next-line + sub_menu_open: 'click' } ); } }; diff --git a/assets/shared/js/frontend/components/search-toggle.js b/assets/shared/js/frontend/components/search-toggle.js old mode 100755 new mode 100644 diff --git a/assets/shared/js/frontend/utility/debounce.js b/assets/shared/js/frontend/utility/debounce.js old mode 100755 new mode 100644 diff --git a/assets/shared/js/frontend/utility/get-screen-size.js b/assets/shared/js/frontend/utility/get-screen-size.js old mode 100755 new mode 100644 diff --git a/assets/shared/js/frontend/vendor/responsive-nav.js b/assets/shared/js/frontend/vendor/responsive-nav.js old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-down-solid.svg b/assets/shared/svg/arrow-down-solid.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-down-white.svg b/assets/shared/svg/arrow-down-white.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-down.svg b/assets/shared/svg/arrow-down.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-paginator.svg b/assets/shared/svg/arrow-paginator.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-right-double.svg b/assets/shared/svg/arrow-right-double.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/arrow-right.svg b/assets/shared/svg/arrow-right.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/checkbox-checked.svg b/assets/shared/svg/checkbox-checked.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/checkbox.svg b/assets/shared/svg/checkbox.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/close.svg b/assets/shared/svg/close.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/error-icon.svg b/assets/shared/svg/error-icon.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/radio-selected.svg b/assets/shared/svg/radio-selected.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/radio.svg b/assets/shared/svg/radio.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/search-arrow-icon.svg b/assets/shared/svg/search-arrow-icon.svg old mode 100755 new mode 100644 diff --git a/assets/shared/svg/search.svg b/assets/shared/svg/search.svg old mode 100755 new mode 100644 diff --git a/comments.php b/comments.php old mode 100755 new mode 100644 diff --git a/composer.lock b/composer.lock old mode 100755 new mode 100644 diff --git a/config/webpack.common.js b/config/webpack.common.js old mode 100755 new mode 100644 diff --git a/config/webpack.dev.js b/config/webpack.dev.js old mode 100755 new mode 100644 diff --git a/config/webpack.prod.js b/config/webpack.prod.js old mode 100755 new mode 100644 diff --git a/config/webpack.settings.js b/config/webpack.settings.js old mode 100755 new mode 100644 diff --git a/home.php b/home.php old mode 100755 new mode 100644 diff --git a/includes/classes/customizer/class-switcher-control.php b/includes/classes/customizer/class-switcher-control.php old mode 100755 new mode 100644 diff --git a/includes/customizer.php b/includes/customizer.php old mode 100755 new mode 100644 index 6b5edd445..1f32b9cc8 --- a/includes/customizer.php +++ b/includes/customizer.php @@ -703,7 +703,7 @@ function css_variables() { */ function inline_css() { $header_background = get_theme_mod( 'maverick_header_background_color_setting', false ); - $header_text_color = get_theme_mod( 'maverick_header_text_color_setting', false ); + $header_text_color = hex_to_hsl( get_theme_mod( 'maverick_header_text_color_setting', false ), true ); $footer_text_color = get_theme_mod( 'maverick_footer_text_color_setting', false ); $footer_background = get_theme_mod( 'maverick_footer_background_color_setting', false ); $footer_social_color = get_theme_mod( 'maverick_footer_social_icons_color_setting', false ); diff --git a/includes/pluggable.php b/includes/pluggable.php old mode 100755 new mode 100644 diff --git a/includes/tgm.php b/includes/tgm.php old mode 100755 new mode 100644 diff --git a/index.php b/index.php index ebeaf727c..c878b9847 100755 --- a/index.php +++ b/index.php @@ -10,7 +10,7 @@