Skip to content

Commit 6a42880

Browse files
committed
Docked grid
1 parent fb05cbd commit 6a42880

File tree

2 files changed

+334
-94
lines changed

2 files changed

+334
-94
lines changed

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

Lines changed: 73 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -167,143 +167,122 @@ $grid-body-maxsize-listing: calc(
167167
@mixin page-columns-docked-wide {
168168
@include page-columns();
169169
grid-template-columns:
170-
[screen-start] $grid-page-margin-start
171-
[screen-start-inset page-start] minmax(50px, 100px)
172-
[page-start-inset] 50px
173-
[body-start-outset] 50px
174-
[body-start] 1.5em
175-
[body-content-start] minmax(
176-
$grid-body-minsize,
177-
$grid-body-maxsize-docked-wide
178-
)
179-
[body-content-end] 1.5em
180-
[body-end] 50px
181-
[body-end-outset] minmax(0px, 100px)
182-
[page-end-inset] 50px
183-
[page-end] 5fr
184-
[screen-end-inset] $grid-page-margin-end
170+
[screen-start] $grid-docked-wide-page-margin-start
171+
[screen-start-inset page-start] $grid-docked-wide-sidebar-seg1
172+
[page-start-inset] $grid-docked-wide-sidebar-seg2
173+
[body-start-outset] $grid-docked-wide-sidebar-seg3
174+
[body-start] $grid-docked-wide-body-margin-start
175+
[body-content-start] $grid-docked-wide-body
176+
[body-content-end] $grid-docked-wide-body-margin-end
177+
[body-end] $grid-docked-wide-margin-seg3
178+
[body-end-outset] $grid-docked-wide-margin-seg2
179+
[page-end-inset] $grid-docked-wide-margin-seg1
180+
[page-end] $grid-docked-wide-margin-margin
181+
[screen-end-inset] $grid-docked-wide-page-margin-end
185182
[screen-end];
186183
}
187184

188185
@mixin page-columns-docked-slimcontent-wide {
189186
@include page-columns();
190187
grid-template-columns:
191-
[screen-start] $grid-page-margin-start
192-
[screen-start-inset page-start] minmax(50px, 100px)
193-
[page-start-inset] 50px
194-
[body-start-outset] 50px
195-
[body-start] 1.5em
196-
[body-content-start] minmax($grid-body-minsize-slim, $grid-body-maxsize-mid)
197-
[body-content-end] 1.5em
198-
[body-end] 50px
199-
[body-end-outset] minmax(0px, 200px)
200-
[page-end-inset] 50px
201-
[page-end] 5fr
202-
[screen-end-inset] $grid-page-margin-end
188+
[screen-start] $grid-docked-wide-slim-page-margin-start
189+
[screen-start-inset page-start] $grid-docked-wide-slim-sidebar-seg1
190+
[page-start-inset] $grid-docked-wide-slim-sidebar-seg2
191+
[body-start-outset] $grid-docked-wide-slim-sidebar-seg3
192+
[body-start] $grid-docked-wide-slim-body-margin-start
193+
[body-content-start] $grid-docked-wide-slim-body
194+
[body-content-end] $grid-docked-wide-slim-body-margin-end
195+
[body-end] $grid-docked-wide-slim-margin-seg3
196+
[body-end-outset] $grid-docked-wide-slim-margin-seg2
197+
[page-end-inset] $grid-docked-wide-slim-margin-seg1
198+
[page-end] $grid-docked-wide-slim-margin-margin
199+
[screen-end-inset] $grid-docked-wide-slim-page-margin-end
203200
[screen-end];
204201
}
205202

206203
@mixin page-columns-docked-fullcontent-wide {
207204
@include page-columns();
208205
grid-template-columns:
209-
[screen-start] $grid-page-margin-start
210-
[screen-start-inset page-start] minmax(50px, 100px)
211-
[page-start-inset] 50px
212-
[body-start-outset] 50px
213-
[body-start] 1.5em
214-
[body-content-start] minmax(
215-
$grid-body-minsize,
216-
$grid-body-maxsize-docked-wide
217-
)
218-
[body-content-end] 1.5em
219-
[body-end body-end-outset page-end-inset page-end] 5fr
220-
[screen-end-inset] $grid-page-margin-end
206+
[screen-start] $grid-docked-wide-full-page-margin-start
207+
[screen-start-inset page-start] $grid-docked-wide-full-sidebar-seg1
208+
[page-start-inset] $grid-docked-wide-full-sidebar-seg2
209+
[body-start-outset] $grid-docked-wide-full-sidebar-seg3
210+
[body-start] $grid-docked-wide-full-body-margin-start
211+
[body-content-start] $grid-docked-wide-full-body
212+
[body-content-end] $grid-docked-wide-full-body-margin-end
213+
[body-end body-end-outset page-end-inset page-end] $grid-docked-wide-full-margin-margin
214+
[screen-end-inset] $grid-docked-wide-full-page-margin-end
221215
[screen-end];
222216
}
223217

224218
@mixin page-columns-docked-listing-wide {
225219
@include page-columns();
226220
grid-template-columns:
227-
[screen-start] $grid-page-margin-start
228-
[screen-start-inset page-start] minmax(50px, 100px)
229-
[page-start-inset] 50px
230-
[body-start-outset] 50px
231-
[body-start] 1.5em
232-
[body-content-start] minmax(
233-
$grid-body-minsize,
234-
$grid-body-maxsize-docked-wide
235-
)
236-
[body-content-end] 1.5em
237-
[body-end] 50px
238-
[body-end-outset] minmax(0px, 100px)
239-
[page-end-inset] 50px
240-
[page-end] 5fr
241-
[screen-end-inset] $grid-page-margin-end
221+
[screen-start] $grid-docked-wide-listing-page-margin-start
222+
[screen-start-inset page-start] $grid-docked-wide-listing-sidebar-seg1
223+
[page-start-inset] $grid-docked-wide-listing-sidebar-seg2
224+
[body-start-outset] $grid-docked-wide-listing-sidebar-seg3
225+
[body-start] $grid-docked-wide-listing-body-margin-start
226+
[body-content-start] $grid-docked-wide-listing-body
227+
[body-content-end] $grid-docked-wide-listing-body-margin-end
228+
[body-end] $grid-docked-wide-listing-margin-seg3
229+
[body-end-outset] $grid-docked-wide-listing-margin-seg2
230+
[page-end-inset] $grid-docked-wide-listing-margin-seg1
231+
[page-end] $grid-docked-wide-listing-margin-margin
232+
[screen-end-inset] $grid-docked-wide-listing-page-margin-end
242233
[screen-end];
243234
}
244235

245236
@mixin page-columns-docked-mid {
246237
@include page-columns();
247238
grid-template-columns:
248-
[screen-start] $grid-page-margin-start
249-
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] minmax(
250-
$grid-body-minsize,
251-
$grid-body-maxsize-mid
252-
)
253-
[body-content-end] 1.5em
254-
[body-end] 50px
255-
[body-end-outset] minmax(25px, 50px)
256-
[page-end-inset] 50px
257-
[page-end] 5fr
258-
[screen-end-inset] $grid-page-margin-end
239+
[screen-start] $grid-docked-mid-page-margin-start
240+
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] $grid-docked-mid-body
241+
[body-content-end] $grid-docked-mid-body-margin-end
242+
[body-end] $grid-docked-mid-margin-seg3
243+
[body-end-outset] $grid-docked-mid-margin-seg2
244+
[page-end-inset] $grid-docked-mid-margin-seg1
245+
[page-end] $grid-docked-mid-margin-margin
246+
[screen-end-inset] $grid-docked-mid-page-margin-end
259247
[screen-end];
260248
}
261249

262250
@mixin page-columns-docked-slimcontent-mid {
263251
@include page-columns();
264252
grid-template-columns:
265-
[screen-start] $grid-page-margin-start
266-
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] minmax(
267-
$grid-body-minsize,
268-
$grid-body-maxsize-mid
269-
)
270-
[body-content-end] 1.5em
271-
[body-end] 35px
272-
[body-end-outset] minmax(75px, 145px)
273-
[page-end-inset] 35px
274-
[page-end] 5fr
275-
[screen-end-inset] $grid-page-margin-end
253+
[screen-start] $grid-docked-mid-slim-page-margin-start
254+
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] $grid-docked-mid-slim-body
255+
[body-content-end] $grid-docked-mid-slim-body-margin-end
256+
[body-end] $grid-docked-mid-slim-margin-seg3
257+
[body-end-outset] $grid-docked-mid-slim-margin-seg2
258+
[page-end-inset] $grid-docked-mid-slim-margin-seg1
259+
[page-end] $grid-docked-mid-slim-margin-margin
260+
[screen-end-inset] $grid-docked-mid-slim-page-margin-end
276261
[screen-end];
277262
}
278263

279264
@mixin page-columns-docked-fullcontent-mid {
280265
@include page-columns();
281266
grid-template-columns:
282-
[screen-start] $grid-page-margin-start
283-
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] minmax(
284-
$grid-body-minsize,
285-
$grid-body-maxsize-docked-wide
286-
)
287-
[body-content-end] 1.5em
288-
[body-end body-end-outset page-end-inset page-end] 5fr
289-
[screen-end-inset] $grid-page-margin-end
267+
[screen-start] $grid-docked-mid-full-page-margin-start
268+
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] $grid-docked-mid-full-body
269+
[body-content-end] $grid-docked-mid-full-body-margin-end
270+
[body-end body-end-outset page-end-inset page-end] $grid-docked-mid-full-margin-margin
271+
[screen-end-inset] $grid-docked-mid-full-page-margin-end
290272
[screen-end];
291273
}
292274

293275
@mixin page-columns-docked-listing-mid {
294276
@include page-columns();
295277
grid-template-columns:
296278
[screen-start] $grid-page-margin-start
297-
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] minmax(
298-
$grid-body-minsize,
299-
$grid-body-maxsize-mid
300-
)
301-
[body-content-end] 1.5em
302-
[body-end] 50px
303-
[body-end-outset] minmax(25px, 50px)
304-
[page-end-inset] 50px
305-
[page-end] 5fr
306-
[screen-end-inset] $grid-page-margin-end
279+
[screen-start-inset page-start page-start-inset body-start-outset body-start body-content-start] $grid-docked-mid-listing-body
280+
[body-content-end] $grid-docked-mid-listing-body-margin-start
281+
[body-end] $grid-docked-mid-slim-margin-seg3
282+
[body-end-outset] $grid-docked-mid-slim-margin-seg2
283+
[page-end-inset] $grid-docked-mid-slim-margin-seg1
284+
[page-end] $grid-docked-mid-listing-margin-margin
285+
[screen-end-inset] $grid-docked-mid-listing-page-margin-end
307286
[screen-end];
308287
}
309288

0 commit comments

Comments
 (0)