Skip to content

Commit 2ca880c

Browse files
committed
gutter
1 parent 29c2094 commit 2ca880c

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,10 @@ function pandocVariablesToThemeDefaults(
446446
// Resolve any grid variables
447447
const gridObj = metadata["grid"] as Metadata;
448448
if (gridObj) {
449-
add(explicitVars, "grid-sidebar-column", gridObj["sidebar-width"]);
450-
add(explicitVars, "grid-margin-column", gridObj["margin-width"]);
451-
add(explicitVars, "grid-body-column", gridObj["body-width"]);
449+
add(explicitVars, "grid-sidebar-width", gridObj["sidebar-width"]);
450+
add(explicitVars, "grid-margin-width", gridObj["margin-width"]);
451+
add(explicitVars, "grid-body-width", gridObj["body-width"]);
452+
add(explicitVars, "grid-gutter-width", gridObj["gutter-width"]);
452453
}
453454
return explicitVars;
454455
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
}
1919

2020
// GRID CASCADE
21-
$grid-body-column-max: $grid-body-column !default;
21+
$grid-body-column-max: $grid-body-width !default;
2222
$grid-body-column-min: 500px !default;
2323

2424
// Margin variables
25-
$grid-page-margin: $grid-margin !default;
25+
$grid-page-margin: $grid-column-gutter-width !default;
2626
$grid-page-margin-start: $grid-page-margin !default;
2727
$grid-page-margin-end: $grid-page-margin !default;
2828

29-
$grid-body-margin: $grid-margin !default;
29+
$grid-body-margin: $grid-column-gutter-width !default;
3030
$grid-body-margin-start: $grid-body-margin !default;
3131
$grid-body-margin-end: $grid-body-margin !default;
3232

3333
/* FLOATING GRID */
3434
$grid-page-margin-float: 5fr !default;
35-
$grid-float-sidebar-column: $grid-sidebar-column !default;
36-
$grid-float-margin-column: $grid-margin-column !default;
35+
$grid-float-sidebar-column: $grid-sidebar-width !default;
36+
$grid-float-margin-column: $grid-margin-width !default;
3737

3838
/* Float Wide Default Grid */
3939

@@ -322,8 +322,8 @@ $grid-float-mid-listing-body: minmax(
322322
) !default;
323323

324324
/* DOCKED GRID */
325-
$grid-docked-sidebar-column: $grid-sidebar-column !default;
326-
$grid-docked-margin-column: $grid-margin-column !default;
325+
$grid-docked-sidebar-column: $grid-sidebar-width !default;
326+
$grid-docked-margin-column: $grid-margin-width !default;
327327
$grid-docked-body-column: $grid-body-column-max + 200px !default;
328328

329329
/* Docked Wide Default Grid */
@@ -583,8 +583,8 @@ $grid-docked-mid-listing-body: minmax(
583583
) !default;
584584

585585
/* DEFAULT (HTML PAGE, NOT IN WEBSITE) GRID */
586-
$grid-default-sidebar-column: $grid-sidebar-column !default;
587-
$grid-default-margin-column: $grid-margin-column !default;
586+
$grid-default-sidebar-column: $grid-sidebar-width !default;
587+
$grid-default-margin-column: $grid-margin-width !default;
588588
$grid-default-body-column: $grid-body-column-max + 50px !default;
589589

590590
/* Default Wide Grid */

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ $input-border-color: theme-override-value(
179179
);
180180

181181
/* GRID VARIABLES */
182-
$grid-margin: 1.5em !default;
183-
$grid-sidebar-column: 250px !default;
184-
$grid-margin-column: 250px !default;
185-
$grid-body-column: 800px !default;
182+
// The left hand sidebar
183+
$grid-sidebar-width: 250px !default;
184+
// The main body
185+
$grid-body-width: 800px !default;
186+
// The right hand margin bar
187+
$grid-margin-width: 250px !default;
188+
// The gutter that appears between the above columns
189+
$grid-column-gutter-width: 1.5em !default;

0 commit comments

Comments
 (0)