Fix comments toggle button

pixelgrade · Jan 23, 2020 · 44b6488 · 44b6488
1 parent 067c12b
commit 44b6488
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 39 deletions.
diff --git a/assets/scss/blocks/nova-blocks/food-menu/_style.scss b/assets/scss/blocks/nova-blocks/food-menu/_style.scss
@@ -13,12 +13,6 @@
 
 .nova-food-menu-item--highlighted {
   border-color: var(--theme-dark-primary);
-  border-top: 0;
-
-  margin-left: calc(var(--menu-offset) * -1);
-  margin-right: calc(var(--menu-offset) * -1);
-
-  padding: 0 var(--menu-offset) 14px;
 }
 
 .nova-food-menu-item__highlight-label {

diff --git a/dist/js/scripts.js b/dist/js/scripts.js
@@ -630,14 +630,11 @@ function () {
       if (instant) {
         $contentWrap.css('height', newHeight);
       } else {
-        TweenMax.to($contentWrap, .4, {
-          height: newHeight,
-          onComplete: function onComplete() {
-            if (isChecked) {
-              $contentWrap.css('height', '');
-            }
-          }
-        });
+        $contentWrap.css('height', newHeight);
+
+        if (isChecked) {
+          $contentWrap.css('height', '');
+        }
       }
     }
   }, {

diff --git a/dist/js/scripts.min.js b/dist/js/scripts.min.js
diff --git a/editor.css b/editor.css
@@ -1500,11 +1500,7 @@
   .editor-styles-wrapper .nova-food-menu__section:not(:first-child) {
     margin-top: var(--theme-spacing-small); }
   .editor-styles-wrapper .nova-food-menu-item--highlighted {
-    border-color: var(--theme-dark-primary);
-    border-top: 0;
-    margin-left: calc(var(--menu-offset) * -1);
-    margin-right: calc(var(--menu-offset) * -1);
-    padding: 0 var(--menu-offset) 14px; }
+    border-color: var(--theme-dark-primary); }
   .editor-styles-wrapper .nova-food-menu-item__highlight-label {
     background-color: var(--theme-dark-primary); }
   .editor-styles-wrapper .nova-food-menu-item__title {

diff --git a/src/components/commentsArea.js b/src/components/commentsArea.js
@@ -28,14 +28,10 @@ export default class CommentsArea {
 		if ( instant ) {
 			$contentWrap.css( 'height', newHeight );
 		} else {
-			TweenMax.to( $contentWrap, .4, {
-				height: newHeight,
-				onComplete: function() {
-					if ( isChecked ) {
-						$contentWrap.css( 'height', '' );
-					}
-				}
-			} );
+			$contentWrap.css( 'height', newHeight );
+			if ( isChecked ) {
+				$contentWrap.css( 'height', '' );
+			}
 		}
 	}
 
@@ -45,4 +41,4 @@ export default class CommentsArea {
 			this.toggle( true );
 		}
 	}
-}
+}
diff --git a/style-rtl.css b/style-rtl.css
@@ -4582,11 +4582,7 @@ span.page-numbers {
   margin-top: var(--theme-spacing-small); }
 
 .nova-food-menu-item--highlighted {
-  border-color: var(--theme-dark-primary);
-  border-top: 0;
-  margin-right: calc(var(--menu-offset) * -1);
-  margin-left: calc(var(--menu-offset) * -1);
-  padding: 0 var(--menu-offset) 14px; }
+  border-color: var(--theme-dark-primary); }
 
 .nova-food-menu-item__highlight-label {
   background-color: var(--theme-dark-primary); }

diff --git a/style.css b/style.css
@@ -4582,11 +4582,7 @@ span.page-numbers {
   margin-top: var(--theme-spacing-small); }
 
 .nova-food-menu-item--highlighted {
-  border-color: var(--theme-dark-primary);
-  border-top: 0;
-  margin-left: calc(var(--menu-offset) * -1);
-  margin-right: calc(var(--menu-offset) * -1);
-  padding: 0 var(--menu-offset) 14px; }
+  border-color: var(--theme-dark-primary); }
 
 .nova-food-menu-item__highlight-label {
   background-color: var(--theme-dark-primary); }