remove base

# Conflicts:
#	src/resources/editor/tools/vs-code.mjs
#	src/resources/editor/tools/yaml/web-worker.js
#	src/resources/editor/tools/yaml/yaml-intelligence-resources.json

Author: dragonstyle

src/format/html/format-html-scss.ts

@@ -446,9 +446,9 @@ function pandocVariablesToThemeDefaults(
   // Resolve any grid variables
   const gridObj = metadata["grid"] as Metadata;
   if (gridObj) {
-    add(explicitVars, "grid-sidebar-base-width", gridObj["sidebar-base-width"]);
-    add(explicitVars, "grid-margin-base-width", gridObj["margin-base-width"]);
-    add(explicitVars, "grid-body-base-width", gridObj["body-base-width"]);
+    add(explicitVars, "grid-sidebar-width", gridObj["sidebar-width"]);
+    add(explicitVars, "grid-margin-width", gridObj["margin-width"]);
+    add(explicitVars, "grid-body-width", gridObj["body-width"]);
     add(explicitVars, "grid-column-gutter-width", gridObj["gutter-width"]);
   }
   return explicitVars;

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

@@ -18,7 +18,7 @@
 }
 
 // GRID CASCADE
-$grid-body-column-max: $grid-body-base-width !default;
+$grid-body-column-max: $grid-body-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-width: $grid-sidebar-base-width !default;
-$grid-float-margin-width: $grid-margin-base-width !default;
+$grid-float-sidebar-width: $grid-sidebar-width !default;
+$grid-float-margin-width: $grid-margin-width !default;
 
 /* Float Wide Default Grid */
 
@@ -322,8 +322,8 @@ $grid-float-mid-listing-body: minmax(
 ) !default;
 
 /* DOCKED GRID */
-$grid-docked-sidebar-width: $grid-sidebar-base-width !default;
-$grid-docked-margin-width: $grid-margin-base-width !default;
+$grid-docked-sidebar-width: $grid-sidebar-width !default;
+$grid-docked-margin-width: $grid-margin-width !default;
 $grid-docked-body-width: $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-width: $grid-sidebar-base-width !default;
-$grid-default-margin-width: $grid-margin-base-width !default;
+$grid-default-sidebar-width: $grid-sidebar-width !default;
+$grid-default-margin-width: $grid-margin-width !default;
 $grid-default-body-width: $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-base-width: 250px !default;
+$grid-sidebar-width: 250px !default;
 // The main body
-$grid-body-base-width: 800px !default;
+$grid-body-width: 800px !default;
 // The right hand margin bar
-$grid-margin-base-width: 250px !default;
+$grid-margin-width: 250px !default;
 // The gutter that appears between the above columns
 $grid-column-gutter-width: 1.5em !default;

src/resources/schema/document-layout.yml

@@ -84,13 +84,13 @@
     object:
       closed: true
       properties:
-        sidebar-base-width:
+        sidebar-width:
           string:
             description: "The base width of the sidebar (left) column in an HTML page."
-        margin-base-width:
+        margin-width:
           string:
             description: "The base width of the margin (right) column in an HTML page."
-        body-base-width:
+        body-width:
           string:
             description: "The base width of the body (center) column in an HTML page."
         gutter-width: