Skip to content

Commit 161e412

Browse files
committed
Add the result of the grids
1 parent 6a42880 commit 161e412

File tree

2 files changed

+439
-118
lines changed

2 files changed

+439
-118
lines changed

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

Lines changed: 111 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66
}
77
}
88

9+
@mixin page-columns {
10+
display: grid;
11+
gap: 0;
12+
}
13+
14+
@mixin column-spanning-element {
15+
table {
16+
background: $body-bg;
17+
}
18+
}
19+
920
$grid-body-padding: 1.5em;
1021
$grid-body-padding-start: $grid-body-padding !default;
1122
$grid-body-padding-end: $grid-body-padding !default;
@@ -275,7 +286,7 @@ $grid-body-maxsize-listing: calc(
275286
@mixin page-columns-docked-listing-mid {
276287
@include page-columns();
277288
grid-template-columns:
278-
[screen-start] $grid-page-margin-start
289+
[screen-start] $grid-docked-mid-listing-page-margin-start
279290
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] $grid-docked-mid-listing-body
280291
[body-content-end] $grid-docked-mid-listing-body-margin-start
281292
[body-end] $grid-docked-mid-slim-margin-seg3
@@ -290,173 +301,166 @@ $grid-body-maxsize-listing: calc(
290301
@mixin page-columns-default-wide {
291302
@include page-columns();
292303
grid-template-columns:
293-
[screen-start] $grid-page-margin-start
294-
[screen-start-inset] 5fr
295-
[page-start page-start-inset] 35px
296-
[body-start-outset] 35px
297-
[body-start] 1.5em
298-
[body-content-start] minmax(
299-
$grid-body-minsize,
300-
$grid-body-maxsize-plain-wide
301-
)
302-
[body-content-end] 1.5em
303-
[body-end] 35px
304-
[body-end-outset] minmax(75px, 145px)
305-
[page-end-inset] 35px
306-
[page-end] 5fr
307-
[screen-end-inset] $grid-page-margin-end
304+
[screen-start] $grid-default-wide-page-margin-start
305+
[screen-start-inset] $grid-default-wide-sidebar-margin
306+
[page-start page-start-inset] $grid-default-wide-sidebar-seg1
307+
[body-start-outset] $grid-default-wide-sidebar-seg2
308+
[body-start] $grid-default-wide-body-margin-start
309+
[body-content-start] $grid-default-wide-body
310+
[body-content-end] $grid-default-wide-body-margin-end
311+
[body-end] $grid-default-wide-margin-seg3
312+
[body-end-outset] $grid-default-wide-margin-seg2
313+
[page-end-inset] $grid-default-wide-margin-seg1
314+
[page-end] $grid-default-wide-margin-margin
315+
[screen-end-inset] $grid-default-wide-page-margin-end
308316
[screen-end];
309317
}
310318

311319
@mixin page-columns-default-mid {
312320
@include page-columns();
313321
grid-template-columns:
314-
[screen-start] $grid-page-margin-start
315-
[screen-start-inset page-start page-start-inset body-start-outset] 5fr
316-
[body-start] 1.5em
322+
[screen-start] $grid-default-mid-page-margin-start
323+
[screen-start-inset page-start page-start-inset body-start-outset] $grid-default-mid-sidebar-margin
324+
[body-start] $grid-default-mid-body-margin-start
317325
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-mid)
318-
[body-content-end] 1.5em
319-
[body-end] 35px
320-
[body-end-outset] minmax(75px, 145px)
321-
[page-end-inset] 35px
322-
[page-end] 5fr
323-
[screen-end-inset] $grid-page-margin-end
326+
[body-content-end] $grid-default-mid-body-margin-end
327+
[body-end] $grid-default-mid-margin-seg3
328+
[body-end-outset] $grid-default-mid-margin-seg2
329+
[page-end-inset] $grid-default-mid-margin-seg1
330+
[page-end] $grid-default-mid-margin-margin
331+
[screen-end-inset] $grid-default-mid-page-margin-end
324332
[screen-end];
325333
}
326334

327335
// Full content grid definitions
328336
@mixin page-columns-fullcontent-wide {
329337
@include page-columns();
330338
grid-template-columns:
331-
[screen-start] $grid-page-margin-start
332-
[screen-start-inset] 5fr
333-
[page-start page-start-inset] 35px
334-
[body-start-outset] 35px
335-
[body-start] 1.5em
336-
[body-content-start] minmax(
337-
$grid-body-minsize,
338-
$grid-body-maxsize-plain-wide
339-
)
340-
[body-content-end] 1.5em
341-
[body-end] 35px
342-
[body-end-outset] 35px
343-
[page-end-inset page-end] 5fr
344-
[screen-end-inset] $grid-page-margin-end
345-
[screen-end];
339+
[screen-start] $grid-default-full-wide-page-margin-start
340+
[screen-start-inset] $grid-default-full-wide-sidebar-margin
341+
[page-start page-start-inset] $grid-default-full-wide-sidebar-seg1
342+
[body-start-outset] $grid-default-full-wide-sidebar-seg2
343+
[body-start] $grid-default-full-wide-body-margin-start
344+
[body-content-start] $grid-default-full-wide-body
345+
[body-content-end] $grid-default-full-wide-body-margin-end
346+
[body-end] $grid-default-full-wide-margin-seg2
347+
[body-end-outset] $grid-default-full-wide-margin-seg1
348+
[page-end-inset page-end] $grid-default-full-wide-margin-margin
349+
[screen-end-inset] $grid-default-full-wide-page-margin-end;
346350
}
347351

348352
@mixin page-columns-fullcontent-mid {
349353
@include page-columns();
350354
grid-template-columns:
351-
[screen-start] $grid-page-margin-start
352-
[screen-start-inset page-start page-start-inset body-start-outset] 5fr
353-
[body-start] 1.5em
355+
[screen-start] $grid-default-full-mid-page-margin-start
356+
[screen-start-inset page-start page-start-inset body-start-outset] $grid-default-full-mid-sidebar-margin
357+
[body-start] $grid-default-full-mid-body-margin-start
354358
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-mid)
355-
[body-content-end] 1.5em
356-
[body-end body-end-outset page-end-inset page-end] 5fr
357-
[screen-end-inset] $grid-page-margin-end
359+
[body-content-end] $grid-default-full-mid-body-margin-end
360+
[body-end body-end-outset page-end-inset page-end] $grid-default-full-mid-margin-margin
361+
[screen-end-inset] $grid-default-full-mid-page-margin-end
358362
[screen-end];
359363
}
360364

361365
// Listing content grid definitions
362366
@mixin page-columns-listing-wide {
363367
@include page-columns();
364368
grid-template-columns:
365-
[screen-start] $grid-page-margin-start
366-
[screen-start-inset page-start] minmax(50px, 100px)
367-
[page-start-inset] 50px
368-
[body-start-outset] 50px
369-
[body-start] 1.5em
369+
[screen-start] $grid-default-listing-wide-page-margin-start
370+
[screen-start-inset page-start] $grid-default-listing-wide-sidebar-seg1
371+
[page-start-inset] $grid-default-listing-wide-sidebar-seg2
372+
[body-start-outset] $grid-default-listing-wide-sidebar-seg3
373+
[body-start] $grid-default-listing-wide-body-margin-start
370374
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-listing)
371-
[body-content-end] 3em
372-
[body-end] 50px
373-
[body-end-outset] minmax(0px, 250px)
374-
[page-end-inset] 50px
375-
[page-end] 1fr
376-
[screen-end-inset] $grid-page-margin-end
375+
[body-content-end] $grid-default-listing-wide-body-margin-end
376+
[body-end] $grid-default-listing-wide-sidebar-seg3
377+
[body-end-outset] $grid-default-listing-wide-margin-seg2
378+
[page-end-inset] $grid-default-listing-wide-sidebar-seg1
379+
[page-end] $grid-default-listing-wide-margin-margin
380+
[screen-end-inset] $grid-default-listing-wide-page-margin-end
377381
[screen-end];
378382
}
379383

380384
@mixin page-columns-listing-mid {
381385
@include page-columns();
382386
grid-template-columns:
383-
[screen-start] $grid-page-margin-start
384-
[screen-start-inset page-start page-start-inset body-start-outset] 5fr
385-
[body-start] 1.5em
386-
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-listing)
387-
[body-content-end body-end body-end-outset page-end-inset page-end] 5fr
388-
[screen-end-inset] $grid-page-margin-end
387+
[screen-start] $grid-default-listing-mid-page-margin-start
388+
[screen-start-inset page-start page-start-inset body-start-outset] $grid-default-listing-mid-sidebar-margin
389+
[body-start] $grid-default-listing-mid-body-margin-start
390+
[body-content-start] $grid-default-listing-mid-body
391+
[body-content-end body-end body-end-outset page-end-inset page-end] $grid-default-listing-mid-margin-margin
392+
[screen-end-inset] $grid-default-listing-mid-page-margin-end
389393
[screen-end];
390394
}
391395

392396
// Slim content grid definitions
393397
@mixin page-columns-slimcontent-wide {
394398
@include page-columns();
395399
grid-template-columns:
396-
[screen-start] $grid-page-margin-start
397-
[screen-start-inset] 5fr
398-
[page-start page-start-inset] 35px
399-
[body-start-outset] 35px
400-
[body-start] 1.5em
400+
[screen-start] $grid-default-slim-wide-page-margin-start
401+
[screen-start-inset] $grid-default-slim-wide-sidebar-margin
402+
[page-start page-start-inset] $grid-default-slim-wide-sidebar-seg1
403+
[body-start-outset] $grid-default-slim-wide-sidebar-seg2
404+
[body-start] $grid-default-slim-wide-body-margin-start
401405
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-mid)
402-
[body-content-end] 1.5em
403-
[body-end] 50px
404-
[body-end-outset] minmax(0px, 200px)
405-
[page-end-inset] 50px
406-
[page-end] 5fr
407-
[screen-end-inset] $grid-page-margin-end
406+
[body-content-end] $grid-default-slim-wide-body-margin-end
407+
[body-end] $grid-default-slim-wide-sidebar-seg3
408+
[body-end-outset] $grid-default-slim-wide-margin-seg2
409+
[page-end-inset] $grid-default-slim-wide-sidebar-seg1
410+
[page-end] $grid-default-slim-wide-margin-margin
411+
[screen-end-inset] $grid-default-slim-wide-page-margin-end
408412
[screen-end];
409413
}
410414

411415
@mixin page-columns-slimcontent-mid {
412416
@include page-columns();
413417
grid-template-columns:
414-
[screen-start] $grid-page-margin-start
415-
[screen-start-inset page-start page-start-inset body-start-outset] 5fr
416-
[body-start] 1.5em
417-
[body-content-start] minmax($grid-body-minsize, $grid-body-maxsize-mid)
418-
[body-content-end] 1.5em
419-
[body-end] 35px
420-
[body-end-outset] minmax(75px, 145px)
421-
[page-end-inset] 35px
422-
[page-end] 5fr
423-
[screen-end-inset] $grid-page-margin-end
418+
[screen-start] $grid-default-slim-mid-page-margin-start
419+
[screen-start-inset page-start page-start-inset body-start-outset] $grid-default-slim-mid-sidebar-margin
420+
[body-start] $grid-default-slim-mid-body-margin-start
421+
[body-content-start] $grid-default-slim-mid-body
422+
[body-content-end] $grid-default-slim-mid-body-margin-end
423+
[body-end] $grid-default-slim-mid-margin-seg3
424+
[body-end-outset] $grid-default-slim-mid-margin-seg2
425+
[page-end-inset] $grid-default-slim-mid-margin-seg1
426+
[page-end] $grid-default-slim-mid-margin-margin
427+
[screen-end-inset] $grid-default-slim-mid-page-margin-end
424428
[screen-end];
425429
}
426430

427431
// TOC left grid
428432
@mixin page-columns-tocleft-wide {
429433
@include page-columns();
430434
grid-template-columns:
431-
[screen-start] $grid-page-margin-start
432-
[screen-start-inset] 5fr
433-
[page-start] 35px
434-
[page-start-inset] minmax(0px, 175px)
435-
[body-start-outset] 35px
436-
[body-start] 1.5em
437-
[body-content-start] minmax($grid-body-minsize-slim, $grid-body-maxsize-mid)
438-
[body-content-end] 1.5em
439-
[body-end] 50px
440-
[body-end-outset] minmax(0px, 200px)
441-
[page-end-inset] 50px
442-
[page-end] 5fr
443-
[screen-end-inset] $grid-page-margin-end
435+
[screen-start] $grid-default-toc-wide-page-margin-start
436+
[screen-start-inset] $grid-default-toc-wide-sidebar-margin
437+
[page-start] $grid-default-toc-wide-sidebar-seg1
438+
[page-start-inset] $grid-default-toc-wide-sidebar-seg2
439+
[body-start-outset] $grid-default-toc-wide-sidebar-seg3
440+
[body-start] $grid-default-toc-wide-body-margin-start
441+
[body-content-start] $grid-default-toc-wide-body
442+
[body-content-end] $grid-default-toc-wide-body-margin-end
443+
[body-end] $grid-default-toc-wide-sidebar-seg3
444+
[body-end-outset] $grid-default-toc-wide-sidebar-seg2
445+
[page-end-inset] $grid-default-toc-wide-sidebar-seg1
446+
[page-end] $grid-default-toc-wide-margin-margin
447+
[screen-end-inset] $grid-default-toc-wide-page-margin-end
444448
[screen-end];
445449
}
446450

447451
@mixin page-columns-tocleft-mid {
448452
@include page-columns();
449453
grid-template-columns:
450-
[screen-start] $grid-page-margin-start
451-
[screen-start-inset] 5fr
452-
[page-start] 35px
453-
[page-start-inset] minmax(0px, 145px)
454-
[body-start-outset] 35px
455-
[body-start] 1.5em
456-
[body-content-start] minmax($grid-body-minsize-slim, $grid-body-maxsize-mid)
457-
[body-content-end] 1.5em
458-
[body-end body-end-outset page-end-inset page-end] 5fr
459-
[screen-end-inset] $grid-page-margin-end
454+
[screen-start] $grid-default-toc-mid-page-margin-start
455+
[screen-start-inset] $grid-default-toc-mid-sidebar-margin
456+
[page-start] $grid-default-toc-mid-sidebar-seg1
457+
[page-start-inset] $grid-default-toc-mid-sidebar-seg2
458+
[body-start-outset] $grid-default-toc-mid-sidebar-seg3
459+
[body-start] $grid-default-toc-mid-body-margin-start
460+
[body-content-start] $grid-default-toc-mid-body
461+
[body-content-end] $grid-default-toc-mid-body-margin-end
462+
[body-end body-end-outset page-end-inset page-end] $grid-default-toc-mid-margin-margin
463+
[screen-end-inset] $grid-default-toc-mid-page-margin-end
460464
[screen-end];
461465
}
462466

@@ -473,14 +477,3 @@ $grid-body-maxsize-listing: calc(
473477
[body-content-end body-end body-end-outset page-end-inset page-end screen-end-inset] $grid-page-margin-end
474478
[screen-end];
475479
}
476-
477-
@mixin page-columns {
478-
display: grid;
479-
gap: 0;
480-
}
481-
482-
@mixin column-spanning-element {
483-
table {
484-
background: $body-bg;
485-
}
486-
}

0 commit comments

Comments
 (0)