@flodesk/grain 5.14.5 → 5.15.2

package/es/types.js

@@ -26,5 +26,6 @@ export var types = {
   gridContentPosition: PropTypes.oneOf(gridContentPositions),
   icon: PropTypes.node,
   zIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  menuAlign: PropTypes.oneOf(['left', 'right'])
+  menuAlign: PropTypes.oneOf(['left', 'right']),
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.node])
 };

package/es/utilities/helpers.js

@@ -19,7 +19,7 @@ export var getCssVar = function getCssVar(type, value) {
   return "var(".concat(getCssVarCore(type, value), ")");
 };
 export var u = function u(amount) {
-  return "calc(var(--grn-unit) * ".concat(amount, ")");
+  return "".concat(amount * 8, "px");
 };
 export var isNumber = function isNumber(value) {
   return typeof value === 'number';

package/es/utilities/styles.js

@@ -43,20 +43,27 @@ export var getIconSize = function getIconSize(size) {
 
   return getDimension(size);
 };
-export var getBorder = function getBorder(borderSide, borderWidth, borderColor) {
-  var borderSides = {
-    all: ["top", "right", "bottom", "left"],
+export var getBorder = function getBorder(borderSide) {
+  var borderWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '1px';
+  var borderColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'border';
+  var sidesObj = {
+    all: [""],
     x: ["right", "left"],
     y: ["top", "bottom"],
     top: ["top"],
-    right: ["right"],
     bottom: ["bottom"],
-    left: ["left"]
+    left: ["left"],
+    right: ["right"]
   };
+  var value = "".concat(getDimension(borderWidth), " solid ").concat(getColor(borderColor));
 
-  if (borderSide in borderSides) {
-    return "\n      ".concat(borderSides[borderSide].map(function (side) {
-      return "border-".concat(side, "-style: solid");
-    }).join(';'), ";\n\n      border-color: ").concat(getColor(borderColor), ";\n      border-width: ").concat(getDimension(borderWidth), ";\n    ");
+  var getSide = function getSide(side) {
+    return side ? "border-".concat(side) : "border";
+  };
+
+  if (borderSide in sidesObj) {
+    return sidesObj[borderSide].map(function (side) {
+      return "".concat(getSide(side), ": ").concat(value);
+    }).join(';');
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flodesk/grain",
-  "version": "5.14.5",
+  "version": "5.15.2",
   "description": "Flodesk design system",
   "module": "es/index.js",
   "author": "Flodesk",