Heritage Buttons don't send GA event for disabled buttons

Fixed extra parameter in mixin

src/styles/mixins/customMixins.scss

@@ -39,8 +39,7 @@
             $color,
             $background,
             $color,
-            $background,
-            $color,
+            $background
     );
   }
 }

src/ux-components/button-main/button-main.vue

@@ -35,16 +35,16 @@ export default {
     },
     methods: {
         clicked() {
-            if (this.pushToGA) {
-                this.pushEventToGA(
-                    this.$route.query[this.queryStrings.ISS_PAGE],
-                    this.GaActions.CLICKED,
-                    this.buttonText,
-                    true
-                );
-            }
-
             if (!this.isDisabled) {
+                if (this.pushToGA) {
+                    this.pushEventToGA(
+                        this.$route.query[this.queryStrings.ISS_PAGE],
+                        this.GaActions.CLICKED,
+                        this.buttonText,
+                        true
+                    );
+                }
+
                 this.$emit('click-event');
             }
         }