Merge branch 'dev' into main

pixelgrade · Jun 17, 2022 · 12ed01d · 12ed01d
2 parents 214efd7 + 7c34e04
commit 12ed01d
Show file tree

Hide file tree

Showing 46 changed files with 167 additions and 231 deletions.
diff --git a/dist/css/block-editor-rtl.css b/dist/css/block-editor-rtl.css
diff --git a/dist/css/block-editor.css b/dist/css/block-editor.css
diff --git a/dist/css/blocks/editor-rtl.css b/dist/css/blocks/editor-rtl.css
diff --git a/dist/css/blocks/editor.css b/dist/css/blocks/editor.css
diff --git a/dist/css/blocks/nova-blocks/conversations-rtl.css b/dist/css/blocks/nova-blocks/conversations-rtl.css
diff --git a/dist/css/blocks/nova-blocks/conversations.css b/dist/css/blocks/nova-blocks/conversations.css
diff --git a/dist/css/blocks/style-rtl.css b/dist/css/blocks/style-rtl.css
diff --git a/dist/css/blocks/style.css b/dist/css/blocks/style.css
diff --git a/dist/css/theme/components-rtl.css b/dist/css/theme/components-rtl.css
diff --git a/dist/css/theme/components.css b/dist/css/theme/components.css
diff --git a/dist/css/theme/style-rtl.css b/dist/css/theme/style-rtl.css
diff --git a/dist/css/theme/style.css b/dist/css/theme/style.css
diff --git a/dist/css/woocommerce/block-editor-rtl.css b/dist/css/woocommerce/block-editor-rtl.css
diff --git a/dist/css/woocommerce/block-editor.css b/dist/css/woocommerce/block-editor.css
diff --git a/dist/css/woocommerce/style-rtl.css b/dist/css/woocommerce/style-rtl.css
diff --git a/dist/css/woocommerce/style.css b/dist/css/woocommerce/style.css
diff --git a/inc/integrations/woocommerce.php b/inc/integrations/woocommerce.php
@@ -276,7 +276,7 @@ function anima_add_end_wrapper_after_related() {
 }
 
 function anima_add_start_main_content() {
-	echo '<div class="nb-sidecar nb-sidecar--sidebar-right nb-sidecar--sidebar-medium nb-content-layout-grid">' .
+	echo '<div class="nb-sidecar nb-sidecar--sidebar-none nb-content-layout-grid">' .
 	'<div class="nb-sidecar-area nb-sidecar-area--content nb-content-layout-grid">';
 }
 

diff --git a/src/scss/block-editor.scss b/src/scss/block-editor.scss
@@ -3,8 +3,7 @@ $assets-folder-path: '../../assets';
 @import "setup";
 @import "social-links";
 
-@import "components/dark-mode-button";
-@import "components/search-nav-button";
+@import "components/navigation-icons";
 
 .block-editor-button-block-appender {
     box-shadow: inset 0 0 0 1px currentColor;

diff --git a/src/scss/components/_dark-mode-button.scss b/src/scss/components/_dark-mode-button.scss
diff --git a/src/scss/components/_navigation-icons.scss b/src/scss/components/_navigation-icons.scss
@@ -0,0 +1,91 @@
+:is(.menu-item--search, .menu-item--dark-mode) {
+  --menu-item-icon-width: calc( var(--icons-size-multiplier) * var(--current-font-size) );
+
+  a {
+    color: currentColor;
+    text-decoration: none;
+
+    &:hover:after {
+      background-color: var(--sm-current-accent-color);
+    }
+  }
+
+  &:not(.no-icon) {
+
+    :is(&, #specific) a {
+      padding-left: calc(var(--menu-item-icon-width) + var(--theme-spacing-smallest));
+
+      &:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 0;
+
+        display: block;
+        width: var(--menu-item-icon-width);
+        height: var(--menu-item-icon-width);
+
+        background-color: currentColor;
+
+        mask: no-repeat 50% 50%;
+        mask-image: var(--menu-item-icon-mask-image);
+        mask-size: contain;
+        -webkit-mask: no-repeat 50% 50%;
+        -webkit-mask-image: var(--menu-item-icon-mask-image);
+        -webkit-mask-size: contain;
+
+        transition: all .25s $ease;
+        transform: translateY(-50%);
+      }
+
+      :is(&, #specific):before {
+        left: calc(var(--menu-item-icon-width) + var(--theme-spacing-smallest))
+      }
+    }
+  }
+
+  &.icon-only {
+
+    a {
+      text-indent: -999999px;
+      height: 100%;
+
+      &:before {
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        min-height: 45px;
+        min-width: 45px;
+        transform: translate(-50%, -50%);
+      }
+
+      &:after {
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}
+
+.menu-item--dark-mode {
+  --menu-item-icon-mask-image: url(#{ $icon-dark-mode-path });
+
+  .is-dark &:not(.no-icon) a:after {
+    transform: translateY(-50%) rotate(180deg);
+  }
+
+  .is-dark &.icon-only a:after {
+    transform: translate(-50%, -50%) rotate(180deg);
+  }
+}
+
+.menu-item--search {
+  --menu-item-icon-mask-image: url(#{ $icon-search-path });
+
+  @include below(lap) {
+	  .nb-navigation & {
+			display: none;
+		}
+	}
+}
diff --git a/src/scss/components/_search-nav-button.scss b/src/scss/components/_search-nav-button.scss
diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -4,7 +4,7 @@ Theme URI: https://demos.pixelgrade.com/anima
 Author: Pixelgrade
 Author URI: https://pixelgrade.com
 Description: Anima is the soul of Pixelgrade LT's carefully crafted site-solutions. Enjoy the entirety of Pixelgrade LT!
-Version: 2.0.7
+Version: 2.0.8
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: __theme_txtd
@@ -70,8 +70,6 @@ Table of Contents
 @import "components/form-helpers";
 @import "components/subscribe-form";
 
-@import "components/dark-mode-button";
-
 /* 2.1. Site Branding */
 @import "components/site-branding";
 
@@ -86,12 +84,12 @@ Table of Contents
 
 /* 2.5. Navigation */
 @import "components/navigation";
+@import "components/navigation-icons";
 @import "components/post-navigation";
 @import "components/screen-reader-text";
 
 /* 2.6. Search Form */
 @import "components/search-overlay";
-@import "components/search-nav-button";
 
 /* 2.7. Logo */
 @import "components/logo";