chore(git): merge conflicts resolved

Author: seejamescode

examples/bootstrap/css-gridish/bootstrap-grid.sketch

@@ -71,7 +71,7 @@
 }
 
 /// Function gets a calculated rem value for a fixed size.
-/// @param {Number} $fixedUnit Fixed nondimensional units.
+/// @param {Number} $unitQuantity Fixed nondimensional units.
 /// @return {Length} A calculated rem value.
 /// @example scss
 /// button {
@@ -85,18 +85,19 @@
 ///     max-width: 5rem;
 ///   }
 /// }
-@function get-fixed-size($fixedUnit) {
-  $rowHeight: map-get($grid-values, "rowHeight");
+@function get-fixed-size($unitQuantity) {
+  // Derive the base unit from the current row height of the grid
+  $fixedUnit: map-get($grid-values, "rowHeight");
 
-  @if ($rowHeight == null or type-of($rowHeight) != "number") {
+  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
     @error "The rowHeight in $grid-values needs be a valid number. Please check your grid configuration.";
   }
 
-  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
-    @error "The provided fixed value `#{$fixedUnit}` to get-fixed-size() needs to be a valid number greater than 0.";
+  @if ($unitQuantity == null or type-of($unitQuantity) != "number") {
+    @error "The provided fixed value `#{$unitQuantity}` to get-fixed-size() needs to be a valid number greater than 0.";
   }
 
-  @return $fixedUnit * $rowHeight * 1rem;
+  @return $unitQuantity * $fixedUnit * 1rem;
 }
 
 /// Utility for declaring mobile-first media queries.

examples/bootstrap/css-gridish/scss/_utilities.scss

@@ -71,7 +71,7 @@
 }
 
 /// Function gets a calculated rem value for a fixed size.
-/// @param {Number} $fixedUnit Fixed nondimensional units.
+/// @param {Number} $unitQuantity Fixed nondimensional units.
 /// @return {Length} A calculated rem value.
 /// @example scss
 /// button {
@@ -85,18 +85,19 @@
 ///     max-width: 5rem;
 ///   }
 /// }
-@function get-fixed-size($fixedUnit) {
-  $rowHeight: map-get($grid-values, "rowHeight");
+@function get-fixed-size($unitQuantity) {
+  // Derive the base unit from the current row height of the grid
+  $fixedUnit: map-get($grid-values, "rowHeight");
 
-  @if ($rowHeight == null or type-of($rowHeight) != "number") {
+  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
     @error "The rowHeight in $grid-values needs be a valid number. Please check your grid configuration.";
   }
 
-  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
-    @error "The provided fixed value `#{$fixedUnit}` to get-fixed-size() needs to be a valid number greater than 0.";
+  @if ($unitQuantity == null or type-of($unitQuantity) != "number") {
+    @error "The provided fixed value `#{$unitQuantity}` to get-fixed-size() needs to be a valid number greater than 0.";
   }
 
-  @return $fixedUnit * $rowHeight * 1rem;
+  @return $unitQuantity * $fixedUnit * 1rem;
 }
 
 /// Utility for declaring mobile-first media queries.

examples/carbon/css-gridish/bx-grid.sketch

@@ -71,7 +71,7 @@
 }
 
 /// Function gets a calculated rem value for a fixed size.
-/// @param {Number} $fixedUnit Fixed nondimensional units.
+/// @param {Number} $unitQuantity Fixed nondimensional units.
 /// @return {Length} A calculated rem value.
 /// @example scss
 /// button {
@@ -85,18 +85,19 @@
 ///     max-width: 5rem;
 ///   }
 /// }
-@function get-fixed-size($fixedUnit) {
-  $rowHeight: map-get($grid-values, "rowHeight");
+@function get-fixed-size($unitQuantity) {
+  // Derive the base unit from the current row height of the grid
+  $fixedUnit: map-get($grid-values, "rowHeight");
 
-  @if ($rowHeight == null or type-of($rowHeight) != "number") {
+  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
     @error "The rowHeight in $grid-values needs be a valid number. Please check your grid configuration.";
   }
 
-  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
-    @error "The provided fixed value `#{$fixedUnit}` to get-fixed-size() needs to be a valid number greater than 0.";
+  @if ($unitQuantity == null or type-of($unitQuantity) != "number") {
+    @error "The provided fixed value `#{$unitQuantity}` to get-fixed-size() needs to be a valid number greater than 0.";
   }
 
-  @return $fixedUnit * $rowHeight * 1rem;
+  @return $unitQuantity * $fixedUnit * 1rem;
 }
 
 /// Utility for declaring mobile-first media queries.

examples/carbon/css-gridish/scss/_utilities.scss

@@ -71,7 +71,7 @@
 }
 
 /// Function gets a calculated rem value for a fixed size.
-/// @param {Number} $fixedUnit Fixed nondimensional units.
+/// @param {Number} $unitQuantity Fixed nondimensional units.
 /// @return {Length} A calculated rem value.
 /// @example scss
 /// button {
@@ -85,18 +85,19 @@
 ///     max-width: 5rem;
 ///   }
 /// }
-@function get-fixed-size($fixedUnit) {
-  $rowHeight: map-get($grid-values, "rowHeight");
+@function get-fixed-size($unitQuantity) {
+  // Derive the base unit from the current row height of the grid
+  $fixedUnit: map-get($grid-values, "rowHeight");
 
-  @if ($rowHeight == null or type-of($rowHeight) != "number") {
+  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
     @error "The rowHeight in $grid-values needs be a valid number. Please check your grid configuration.";
   }
 
-  @if ($fixedUnit == null or type-of($fixedUnit) != "number") {
-    @error "The provided fixed value `#{$fixedUnit}` to get-fixed-size() needs to be a valid number greater than 0.";
+  @if ($unitQuantity == null or type-of($unitQuantity) != "number") {
+    @error "The provided fixed value `#{$unitQuantity}` to get-fixed-size() needs to be a valid number greater than 0.";
   }
 
-  @return $fixedUnit * $rowHeight * 1rem;
+  @return $unitQuantity * $fixedUnit * 1rem;
 }
 
 /// Utility for declaring mobile-first media queries.