rename scss vars

Author: dragonstyle

src/resources/formats/html/bootstrap/_bootstrap-mixins.scss

@@ -18,7 +18,7 @@
 }
 
 // GRID CASCADE
-$grid-body-column-max: $grid-body-width !default;
+$grid-body-column-max: $grid-body-base-width !default;
 $grid-body-column-min: 500px !default;
 
 // Margin variables
@@ -32,8 +32,8 @@ $grid-body-gutter-end: $grid-body-gutter !default;
 
 /* FLOATING GRID */
 $grid-page-gutter-float: 5fr !default;
-$grid-float-sidebar-column: $grid-sidebar-width !default;
-$grid-float-margin-column: $grid-margin-width !default;
+$grid-float-sidebar-column: $grid-sidebar-base-width !default;
+$grid-float-margin-column: $grid-margin-base-width !default;
 
 /* Float Wide Default Grid */
 
@@ -322,8 +322,8 @@ $grid-float-mid-listing-body: minmax(
 ) !default;
 
 /* DOCKED GRID */
-$grid-docked-sidebar-column: $grid-sidebar-width !default;
-$grid-docked-margin-column: $grid-margin-width !default;
+$grid-docked-sidebar-column: $grid-sidebar-base-width !default;
+$grid-docked-margin-column: $grid-margin-base-width !default;
 $grid-docked-body-column: $grid-body-column-max + 200px !default;
 
 /* Docked Wide Default Grid */
@@ -583,8 +583,8 @@ $grid-docked-mid-listing-body: minmax(
 ) !default;
 
 /* DEFAULT (HTML PAGE, NOT IN WEBSITE) GRID */
-$grid-default-sidebar-column: $grid-sidebar-width !default;
-$grid-default-margin-column: $grid-margin-width !default;
+$grid-default-sidebar-column: $grid-sidebar-base-width !default;
+$grid-default-margin-column: $grid-margin-base-width !default;
 $grid-default-body-column: $grid-body-column-max + 50px !default;
 
 /* Default Wide Grid */

src/resources/formats/html/bootstrap/_bootstrap-variables.scss

@@ -180,10 +180,10 @@ $input-border-color: theme-override-value(
 
 /* GRID VARIABLES */
 // The left hand sidebar
-$grid-sidebar-width: 250px !default;
+$grid-sidebar-base-width: 250px !default;
 // The main body
-$grid-body-width: 800px !default;
+$grid-body-base-width: 800px !default;
 // The right hand margin bar
-$grid-margin-width: 250px !default;
+$grid-margin-base-width: 250px !default;
 // The gutter that appears between the above columns
 $grid-column-gutter-width: 1.5em !default;