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 02350ee21a4029cb388e847f5197f12ea49ad108..6a75ddf83d9136a0f45078f004885759668849c0 100644 (file)
--- 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 (file)
index 0000000..80cc0fb
--- /dev/null
+++ b/wp-content/themes/physioassist/resources/assets/images/icons/phone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="#fff"><path d="M17.89 23.92c-1.15 0-2.32-.32-3.36-.99-.01 0-.02-.01-.03-.02A50.015 50.015 0 011 9.4c-1.6-2.51-1.25-5.7.83-7.78L2.6.85c1-1 2.64-1 3.64 0l3.23 3.24c1 1.01 1 2.64 0 3.64-.42.42-.42 1.11 0 1.54l5.18 5.18c.21.21.48.32.77.32.29 0 .56-.11.77-.32 1-1 2.64-1 3.64 0l3.24 3.23c1 1 1 2.64 0 3.64l-.77.77a6.233 6.233 0 01-4.41 1.83zm-2.56-2.24c1.91 1.2 4.33.93 5.91-.65l.77-.77c.42-.42.42-1.11 0-1.54l-3.23-3.23c-.42-.42-1.11-.42-1.54 0-.48.49-1.13.75-1.82.75-.69 0-1.33-.27-1.82-.75l-5.18-5.18c-1-1-1-2.64 0-3.64.42-.42.42-1.11 0-1.53L5.19 1.91c-.42-.42-1.11-.42-1.54 0l-.77.76a4.724 4.724 0 00-.64 5.91c3.5 5.18 7.9 9.59 13.09 13.1zM19.54 9.77c-.41 0-.74-.33-.74-.74 0-2.05-1.67-3.72-3.72-3.72-.41 0-.74-.33-.74-.74s.33-.74.74-.74a5.22 5.22 0 015.21 5.21c-.01.4-.34.73-.75.73z"/><path d="M23.26 9.77c-.41 0-.74-.33-.74-.74 0-4.1-3.34-7.44-7.44-7.44-.41 0-.74-.33-.74-.74s.33-.74.74-.74C20 .1 24 4.11 24 9.03c0 .41-.33.74-.74.74z"/></g></svg>

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 3d714493a55c0058a3f82223cc3b25c553f13cf4..288cf8e39cd2b09a8dfa968ccc5ca2e28f1066da 100644 (file)
--- 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 763a9784a205e78ca759e28294681c68871965fe..749b831fe86e25a419d0ce36edc593de4606db0b 100644 (file)
--- 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 f65214f509d3ae1f7de6e8f9b920a00ebdd849c3..2879c13bd38a3b7fc435921d43dead92248aac7d 100644 (file)
--- 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 334a4a1a359b0ba255f2d55ea67405001be2e885..aac4075e5f869b18f1db0dd188e81892efec50b8 100644 (file)
--- 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 74a927f0007546d66eddb2fc41665e6c9cb8c3c2..ffcd451ae775a84392756d85589af175176c9976 100644 (file)
--- 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 @@
       </nav>
     </div>
   </div>
+  <a class="header-phone" href="#">
+    <div class="header-phone-content">
+      <img class="header-phone-icon" src="@asset('images/icons/phone.svg')" alt="Phone"> 04 67 03 13 92
+    </div>
+  </a>
 </header>