@vaadin/vaadin-themable-mixin - npm Package Compare versions

Comparing version 1.4.2 to 1.4.3

package.json

@@ -12,3 +12,3 @@ {
   "name": "@vaadin/vaadin-themable-mixin",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "main": "vaadin-themable-mixin.js",
@@ -15,0 +15,0 @@ "author": "Vaadin Ltd",

vaadin-themable-mixin.js

@@ -40,5 +40,14 @@ import { DomModule } from '@polymer/polymer/lib/elements/dom-module.js';
 
+        const vaadinThemePrefixes = ['lumo-', 'material-'];
+        const vaadinThemeA = vaadinThemePrefixes.filter(prefix => moduleNameA.indexOf(prefix) === 0).length > 0;
+        const vaadinThemeB = vaadinThemePrefixes.filter(prefix => moduleNameB.indexOf(prefix) === 0).length > 0;
+
         if (vaadinA !== vaadinB) {
+          // Include vaadin core styles first
           return vaadinA ? -1 : 1;
+        } else if (vaadinThemeA !== vaadinThemeB) {
+          // Include vaadin theme styles after that
+          return vaadinThemeA ? -1 : 1;
         } else {
+          // Lastly include custom styles so they override all vaadin styles
           return 0;
@@ -45,0 +54,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

29355

increased by1.92%

Lines of code

97

increased by8.99%

No dependency changes