From: stephen@cubedesigners.com Date: Wed, 15 Jan 2020 18:31:51 +0000 (+0000) Subject: WIP #3329 @8 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bba11492d89eeff99419a31be077da895c4c533f;p=physioassist-wordpress.git WIP #3329 @8 --- diff --git a/wp-content/mu-plugins/wp-migrate-db-pro-compatibility.php b/wp-content/mu-plugins/wp-migrate-db-pro-compatibility.php index 02350ee2..6a75ddf8 100644 --- a/wp-content/mu-plugins/wp-migrate-db-pro-compatibility.php +++ b/wp-content/mu-plugins/wp-migrate-db-pro-compatibility.php @@ -4,11 +4,15 @@ Plugin Name: WP Migrate DB Compatibility Plugin URI: http://deliciousbrains.com/wp-migrate-db-pro/ Description: Prevents 3rd party plugins from being loaded during WP Migrate DB specific operations Author: Delicious Brains -Version: 1.1 +Version: 1.2 Author URI: http://deliciousbrains.com */ -$GLOBALS['wpmdb_compatibility']['active'] = true; +if ( ! version_compare( PHP_VERSION, '5.4', '>=' ) ) { + return; +} + +$GLOBALS['wpmdb_compatibility']['active'] = true; if ( defined( 'WP_PLUGIN_DIR' ) ) { $plugins_dir = trailingslashit( WP_PLUGIN_DIR ); @@ -22,7 +26,9 @@ if ( defined( 'WP_PLUGIN_DIR' ) ) { } else { $plugins_dir = plugin_dir_path( __FILE__ ) . '../plugins/'; } -$compat_class_path = 'class/wpmdb-compatibility.php'; + +$compat_class_path = 'class/Common/Compatibility/Compatibility.php'; +$compat_class_name = 'DeliciousBrains\WPMDB\Common\Compatibility\Compatibility'; $wpmdbpro_compatibility_class = $plugins_dir . 'wp-migrate-db-pro/' . $compat_class_path; $wpmdb_compatibility_class = $plugins_dir . 'wp-migrate-db/' . $compat_class_path; @@ -32,6 +38,6 @@ if ( file_exists( $wpmdbpro_compatibility_class ) ) { include_once $wpmdb_compatibility_class; } -if ( class_exists( 'WPMDB_Compatibility' ) ) { - new WPMDB_Compatibility(); -} +if ( class_exists( $compat_class_name ) ) { + new $compat_class_name; +} \ No newline at end of file diff --git a/wp-content/themes/physioassist/resources/assets/images/icons/phone.svg b/wp-content/themes/physioassist/resources/assets/images/icons/phone.svg new file mode 100644 index 00000000..80cc0fbe --- /dev/null +++ b/wp-content/themes/physioassist/resources/assets/images/icons/phone.svg @@ -0,0 +1 @@ + diff --git a/wp-content/themes/physioassist/resources/assets/styles/common/debug.styl b/wp-content/themes/physioassist/resources/assets/styles/common/debug.styl index 3d714493..288cf8e3 100644 --- a/wp-content/themes/physioassist/resources/assets/styles/common/debug.styl +++ b/wp-content/themes/physioassist/resources/assets/styles/common/debug.styl @@ -1,5 +1,5 @@ // Debugging styles -$debug = 1 +$debug = 0 if ($debug > 1) @@ -16,7 +16,7 @@ if ($debug) lost-utility: overlay $content-max-width 1 10px #ccc; body - lost-utility: overlay 1512px 1 2px rgba(#fc0,0.7); + lost-utility: overlay 1512px 1 2px rgba(#fc0, 0.5); // Centre line &:after diff --git a/wp-content/themes/physioassist/resources/assets/styles/components/navigation.styl b/wp-content/themes/physioassist/resources/assets/styles/components/navigation.styl index 763a9784..749b831f 100644 --- a/wp-content/themes/physioassist/resources/assets/styles/components/navigation.styl +++ b/wp-content/themes/physioassist/resources/assets/styles/components/navigation.styl @@ -74,7 +74,7 @@ a display: block - padding: 1em 4em + padding: 1em 3em border: none &:hover color: $colors.light-blue diff --git a/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl b/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl index f65214f5..2879c13b 100644 --- a/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl +++ b/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl @@ -38,7 +38,7 @@ header.site // Logo is split into symbol + text so we can hide the symbol when reducing the header height .logo max-width: 235px - margin: 0 10px 15px 4px + padding: 0 10px 15px 4px width: 70% // Only relevant when we reach smaller screens - leaves room for burger menu icon &-symbol @@ -56,6 +56,34 @@ header.site display: none +.header-phone + position: absolute + left: 100% + bottom: 0.4em + display: flex + align-items: center + background-color: #1f8ccc + color: #fff + transition: transform 0.5s ease + transform: translateX(-3.5em) // 1em padding + 1.5em icon width + 1em padding + + &:hover + transform: translateX(-100%) + + .transparent-header-disabled & + bottom: 0 + height: 100% + + &-content + white-space: nowrap + padding: 1em + + &-icon + width: 1.5em + margin-right: 1em + + + //----- Transparent Header overrides .template-transparent-header // Only shown when we're above the breakpoint, otherwise it remains in the default compact mode @@ -66,7 +94,7 @@ header.site background-color: transparent .navigation - bottom: -12px // Pull nav text down so it lines up with baseline of logo text + bottom: 8px // Align nav with logo text transform: none .nav-primary, .locales diff --git a/wp-content/themes/physioassist/resources/assets/styles/widgets/hero-block.styl b/wp-content/themes/physioassist/resources/assets/styles/widgets/hero-block.styl index 334a4a1a..aac4075e 100644 --- a/wp-content/themes/physioassist/resources/assets/styles/widgets/hero-block.styl +++ b/wp-content/themes/physioassist/resources/assets/styles/widgets/hero-block.styl @@ -3,7 +3,8 @@ $header-height = 84px // How much space to leave for transparent header .hero-block font-smoothing() - background-image: linear-gradient(to right, #0b4a70 0%, #0b4a70 50%, #d3ebf6 50%, #d3ebf6 100%) + //background-image: linear-gradient(to right, #0b4a70 0%, #0b4a70 50%, #d3ebf6 50%, #d3ebf6 100%) + background-color: #f7f8fc color: #fff +below($breakpoint-hero-block) @@ -12,10 +13,11 @@ $header-height = 84px // How much space to leave for transparent header &-inner center() position: relative + background-image: linear-gradient(to left, #d8effa 0%, #acd1e7 35%, #0b4a70 100%) &-image display: block - margin: 0 auto + width: 100% +below($breakpoint-hero-block) display: none diff --git a/wp-content/themes/physioassist/resources/views/partials/header.blade.php b/wp-content/themes/physioassist/resources/views/partials/header.blade.php index 74a927f0..ffcd451a 100644 --- a/wp-content/themes/physioassist/resources/views/partials/header.blade.php +++ b/wp-content/themes/physioassist/resources/views/partials/header.blade.php @@ -21,4 +21,9 @@ + +
+ Phone 04 67 03 13 92 +
+