@ulu/frontend 0.1.0-beta.32 → 0.1.0-beta.33

package/scss/components/_button-verbose.scss

@@ -48,11 +48,11 @@ $-fallbacks: (
 /// @prop {String} title-color [link] Color of the title of the button.
 /// @prop {String} title-color-hover [link-hover] Color of the title of the button when hovered or focused.
 /// @prop {Dimension} title-margin [0.5em] Margin for the button's title.
-/// @prop {Boolean} left-cap [false] Enable left cap style 
-/// @prop {Color} left-cap-color ["link"] The color for the left cap
-/// @prop {color} left-cap-color-hover ["link-hover"] The color for the left cap when the button is hovered
-/// @prop {Number} left-cap-color-hover [0.5rem] Width of the cap
-/// @prop {Number} left-cap-match-radius [true] The cap should have be rounded to match the parent's border radius
+/// @prop {Boolean} cap [false] Enable left cap style 
+/// @prop {Color} cap-side ["left"] The side that gets the cap
+/// @prop {Number} cap-match-radius [true] The cap should have be rounded to match the parent's border radius
+/// @prop {Map} cap-options The options for cap (see element.cap for options)
+/// @prop {Map} cap-options-hover The options for cap when hovered
 
 $config: (
   "background-color" : white,
@@ -69,16 +69,21 @@ $config: (
   "margin" : 1em,
   "margin-inline" : 0.75em,
   "min-width": 20rem,
-  "padding-x": 0.65em,
+  "padding-x": 0.75em,
   "padding-y": 1em,
   "title-color": "link",
   "title-margin" : 0.5em,
   "title-color-hover" : "link-hover",
-  "left-cap" : false,
-  "left-cap-color" : "link",
-  "left-cap-color-hover" : "link-hover",
-  "left-cap-width" : 0.5rem,
-  "left-cap-match-radius" : true
+  "cap" : false,
+  "cap-side" : "left",
+  "cap-match-radius" : true,
+  "cap-options" : (
+    "color" : "link",
+    "size" : 0.5rem,
+  ),
+  "cap-options-hover" : (
+    "color" : "link-hover"
+  ),
 ) !default;
 
 /// Change modules $config
@@ -112,40 +117,30 @@ $config: (
 
 @mixin styles {
   $prefix: selector.class("button-verbose");
+  $padding-x: get("padding-x");
+  $padding-y: get("padding-y");
+  $padding-right: ($padding-x * 2) + 1em;
+  $cap-side: get("cap-side");
+  $cap-defaults: (
+    "border-radius" : if(get("cap-match-radius"), get("border-radius"), 0),
+    "padding-adjust" : if(utils.is-side($cap-side), $padding-x, $padding-y)
+  );
   
   #{ $prefix } {
     text-decoration: none;
     border-radius: get("border-radius");
     box-shadow: get("box-shadow");
     line-height: get("line-height");
-    position: relative;
+    position: relative; // For cap and icon
     display: block;
     margin-bottom: get("margin");
     max-width: 100%;
     width: get("min-width");
     background-color: color.get(get("background-color"));
-    padding: get("padding-y") get("padding-x");
-    padding-right: (get("padding-x") * 2) + 1em;
+    padding: $padding-y $padding-right $padding-y $padding-x;
     color: color.get(get("color"));
     text-align: left;
-    // Add border like cap
-    @if get("left-cap") {
-      padding-left: calc(get("padding-x") + get("left-cap-width"));
-      &::after {
-        content: "";
-        display: block;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: get("left-cap-width");
-        background-color: color.get(get("left-cap-color"));
-        @if get("left-cap-match-radius") {
-          border-top-left-radius: get("border-radius");
-          border-bottom-left-radius: get("border-radius");
-        }
-      }
-    }
+
     &:hover {
       color: color.get(get("color-hover"));
       background-color: color.get(get("background-color-hover"));
@@ -160,9 +155,19 @@ $config: (
           color: color.get(get("icon-color-hover"));
         }
       }
-      @if (get("left-cap") and get("left-cap-color-hover")) {
-        &::after {
-          background-color: color.get(get("left-cap-color-hover"));
+    }
+    @if get("cap") {
+      @include element.cap(
+        $side: $cap-side,
+        $options: map.merge($cap-defaults, get("cap-options"))
+      );
+      @if get("cap-options-hover") {
+        &:hover,
+        &:focus {
+          @include element.cap-appearance(
+            $side: $cap-side,
+            $options: get("cap-options-hover")
+          );
         }
       }
     }
@@ -180,7 +185,7 @@ $config: (
   #{ $prefix }__icon {
     position: absolute;
     top: 50%;
-    right: get("padding-x");
+    right: $padding-x;
     transform: translateY(-50%);
     font-size: get("icon-font-size");
     color: color.get(get("icon-color"));

package/scss/components/_callout.scss

@@ -27,48 +27,51 @@ $-fallbacks: (
 /// @prop {Boolean} border-radius [true] The border radius of the Callout.
 /// @prop {Dimension} border-width [1px] The border width of the Callout.
 /// @prop {CssValue} box-shadow [none] The box-shadow of the Callout.
-/// @prop {Boolean} left-cap [false] Toggles the use of left caps in styled callouts.
-/// @prop {Color} left-cap-color [green] Color of the left cap.
-/// @prop {Dimension} left-cap-width [0.5rem] Width of the left cap.
+/// @prop {Boolean} caps-disabled [false] If set will not output any cap styles for both base and styles
+/// @prop {Boolean} cap [false] Toggles the use of caps on default callout
+/// @prop {Boolean} cap-side ["left"] The side that gets the cap
+/// @prop {Number} cap-match-radius [true] The cap should have be rounded to match the parent's border radius
+/// @prop {Map} cap-options The options for cap (see element.cap for options)
 /// @prop {Dimension} margin [2rem] Bottom margin of the Callout.
 /// @prop {Dimension} padding [1.5rem] Padding of the Callout.
 
 $config: (
   "background-color" : rgb(240, 240, 240),
   "border-color" : "rule-light",
-  "border-radius" :  true,
+  "border-radius" :  6px,
   "border-width" : 1px,
   "box-shadow" : none,
-  "left-cap" : true,
-  "left-cap-color" : rgb(160, 160, 160),
-  "left-cap-width" : 0.5rem,
+  "caps-disabled" : false,
+  "cap" : false,
+  "cap-side" : "left",
+  "cap-match-radius" : false,
+  "cap-options" : (
+    "color" : rgb(160, 160, 160),
+    "size" : 0.5rem,
+  ),
   "margin" : 2rem,
   "padding" : 1.5rem,
 ) !default;
 
+/// Styles Map (for unique variations/modifiers)
+/// - Adjust this with set-styles
+/// @type Map
+
 $styles: (
   "outline" : (
     "background-color": transparent
   ),
   "info" : (
     "background-color" : "info-background",
-    "left-cap-color" : "info",
-    "left-cap" : true,
   ),
   "warning" : (
     "background-color" : "info-background",
-    "left-cap-color" : "info",
-    "left-cap" : true,
   ),
   "success" : (
     "background-color" : "success-background",
-    "left-cap-color" : "success",
-    "left-cap" : true,
   ),
   "danger" : (
     "background-color" : "danger-background",
-    "left-cap-color" : "danger",
-    "left-cap" : true,
   ),
 ) !default;
 
@@ -92,7 +95,8 @@ $styles: (
 }
 
 /// Set callout style variations
-/// @param {Map} $changes Map of changes (options for style include [background-color, color, border, border-radius, border-color, box-shadow, padding, left-cap, left-cap-width, left-cap-color]
+/// - Styles that modify padding when using mix-match caps on/off should be included last
+/// @param {Map} $changes Map of changes (options for style include [background-color, color, border-color, border-radius, border-width, box-shadow, padding, cap, cap-options]
 /// @param {String} $merge-mode Merge mode see utils.map-merge() [null|"deep"|"overwrite"]
 
 @mixin set-styles($changes, $merge-mode: null) {
@@ -104,11 +108,17 @@ $styles: (
 ///  @include ulu.component-callout-styles();
 
 @mixin styles {
-  $prefix: selector.class("callout");
-  
+  $prefix: selector.class("callout");  
+  $padding: get("padding");
+  $padding-info: utils.get-spacing($padding);
+  $cap-options: get("cap-options");
+  $cap-size: map.get($cap-options, "size");
+  $cap-side: get("cap-side");
+
   #{ $prefix } {
+    position: relative; // For cap
     background-color: color.get(get("background-color"));
-    padding: get("padding");
+    padding: $padding;
     border: get("border-width") solid color.get(get("border-color"));
     margin-bottom: get("margin");
     box-shadow: get("box-shadow");
@@ -116,48 +126,98 @@ $styles: (
     & >:first-child {
       margin-top: 0;
     }
-    &::before {
-      position: absolute;
-      left: 0 - get("border-width");
-      top: 0 - get("border-width");
-      bottom: 0 - get("border-width");
-      width: get("left-cap-width");
-      background-color: color.get(get("left-cap-color"));
+
+    // If we have left cap on default we reuse this for all
+    // Else we will print it out manually for each unique style
+    @if (not get("caps-disabled")) {   
+      $cap-defaults: (
+        "offset" : get("border-width"),
+        "border-radius" : if(get("cap-match-radius"), get("border-radius"), null),
+        // "padding-adjust" : map.get($padding-info, $cap-side)
+      );
+      @include element.cap(
+        $side: $cap-side,
+        $options: map.merge($cap-defaults, $cap-options)
+      );
     }
-    @if get("left-cap") {
-      @include -left-cap();
+      
+    // If the left cap is disabled we still include it's CSS but we hide it
+    // so that other styles of callouts can use it
+    @if (not get("cap")) {
+      &::before {
+        content: none;
+      }
+    // Since this is hidden and reused we need to not use padding adjust unless it
+    // was visible
+    } @else if ($cap-size) {
+      padding-#{ $cap-side }: calc(map.get($padding-info, $cap-side) + $cap-size);
     }
   }
+
+  @include -output-style-modifiers();
+}
+
+// Output Each Style Modifier
+// - Note if cap is not disabled this will just update appearance values of cap styling
+@mixin -output-style-modifiers() {
+  $prefix: selector.class("callout");  
+  $caps-enabled: not get("caps-disabled");
+  $cap-side: get("cap-side");
+
   @each $name, $style in $styles {
-    $left-cap-color: map.get($style, "left-cap-color");
+    $cap: map.get($style, "cap");
+    $padding: map.get($style, "padding");
+    $border-radius: map.get($style, "border-radius");
+    $background-color: map.get($style, "background-color");
+    $color: map.get($style, "color");
+    $border-color: map.get($style, "border-color");
+    $border-width: map.get($style, "border-width");
+    $box-shadow: map.get($style, "box-shadow");
+    $cap-match-radius: map.get($style, "cap-match-radius");
+
     #{ $prefix }--#{ $name } {
-      background-color: color.get(map.get($style, "background-color")); 
-      color: color.get(map.get($style, "color")); 
-      border: map.get($style, "border"); 
-      border-radius: map.get($style, "border-radius"); 
-      border-color: color.get(map.get($style, "border-color")); 
-      box-shadow: map.get($style, "box-shadow"); 
-      padding: map.get($style, "padding"); 
-      @if $left-cap-color {
+      background-color: color.get($background-color); 
+      color: color.get($color); 
+      border-radius: $border-radius; 
+      border-color: color.get($border-color); 
+      border-width: $border-width; 
+      box-shadow: $box-shadow; 
+      padding: $padding; 
+
+      @if ($cap and $caps-enabled) {
+        $match-radius: utils.if-type("bool", $cap-match-radius, get("cap-match-radius"));
+        // Padding adjust always has to be set (since size could change or padding)
+        $padding-info: utils.get-spacing(if($padding, $padding, get("padding")));
+        $cap-radius: utils.if-type("number", $border-radius, get("border-radius"));
+        $cap-options: utils.ensure-map(map.get($style, "cap-options"));
+        $cap-defaults: (
+          "size" : map.get(get("cap-options"), "size"),
+          "padding-adjust" : map.get($padding-info, $cap-side),
+          "offset" : $border-width,
+          "border-radius" : if($match-radius, $cap-radius, null)
+        );
+
+        @include element.cap-appearance(
+          $side: $cap-side,
+          $options: map.merge($cap-defaults, $cap-options),
+          $before: true
+        );
+
+        // Because the main callout's cap may not be visible
         &::before {
-          background-color: color.get($left-cap-color);
+          content: "";
+        }
+      // If set to false remove the cap (if enabled) and reset default cap padding adjust
+      } @else if ($cap == false and $caps-enabled) {
+        // if this style doesn't set padding
+        @if (not $padding) {
+          $padding-info: utils.get-spacing(get("padding"));
+          padding-#{ $cap-side }: map.get($padding-info, $cap-side);
+        }
+        &::before {
+          content: none;
         }
-      }
-      @if map.get($style, "left-cap") and not get("left-cap") {
-        // if current style has left cap and the global callout does not. This prevents duplicate styles printing.
-        @include -left-cap();
       }
     }
   }
-}
-
-@mixin -left-cap() {
-  $left-padding: get-spacing-left(get("padding"));
-  position: relative; 
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  padding-left: get("left-cap-width") + $left-padding;
-  &::before {
-    content: "";
-  }
 }

package/types/ui/tooltip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../js/ui/tooltip.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH,6BAGC;AAED;;;;GAIG;AACH,8BAGC;AAED,oDAOC;AAED;;;;GAIG;AACH;IACE;;OAEG;IACH;QACE;;;;WAIG;;QAEH;;;WAGG;;;;;QAKH;;;WAGG;qBADO,SAAO,IAAI;QAGrB;;WAEG;;QAEH;;;WAGG;;QAEH;;;WAGG;oBADO,aAAc;QAGxB;;;WAGG;oBADO,aAAc;QAGxB;;;WAGG;;QAEH;;WAEG;;QAUH;;;WAGG;;MAIH;IACF,kCAEE;IACF,mEAaC;IAPC,aAA+D;IAC/D,qBAAyF;IACzF,cAA+B;IAC/B,aAAkB;IAClB,gBAAmB;IAIrB,cAIC;IACD,2BAKC;IACD,gBAGC;IACD,uBAcC;IACD,gCASC;IACD,6BAkBC;IACD,uBAiCC;IACD,wBAiBC;IACD,wCAmBC;IACD,sDAEC;IACD,+BAEC;IADC,0BAA4E;IAE9E,gCAKC;IACD,uBAEC;IACD,uBAEC;CACF"}
+{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../js/ui/tooltip.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH,6BAGC;AAED;;;;GAIG;AACH,8BAGC;AAED,oDAQC;AAED;;;;GAIG;AACH;IACE;;OAEG;IACH;QACE;;;;WAIG;;QAEH;;;WAGG;;;;;QAKH;;;WAGG;qBADO,SAAO,IAAI;QAGrB;;WAEG;;QAEH;;;WAGG;;QAEH;;;WAGG;oBADO,aAAc;QAGxB;;;WAGG;oBADO,aAAc;QAGxB;;;WAGG;;QAEH;;WAEG;;QAUH;;;WAGG;;MAIH;IACF,kCAEE;IACF,mEAaC;IAPC,aAA+D;IAC/D,qBAAyF;IACzF,cAA+B;IAC/B,aAAkB;IAClB,gBAAmB;IAIrB,cAIC;IACD,2BAKC;IACD,gBAGC;IACD,uBAcC;IACD,gCASC;IACD,6BAkBC;IACD,uBAiCC;IACD,wBAiBC;IACD,wCAmBC;IACD,sDAEC;IACD,+BAEC;IADC,0BAA4E;IAE9E,gCAKC;IACD,uBAEC;IACD,uBAEC;CACF"}