Skip to content

Commit 79569e8

Browse files
markdumaymarkdumay
authored
Merge pull request #1668 from gethinode/templatev2
Templatev2
2 parents 2340e33 + 538e75b commit 79569e8

37 files changed

+1081
-486
lines changed

‎assets/scss/app-dart.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
@import "theme/variables.scss";
99
@import "common/icons.scss";
1010

11+
// Import custom utilities (must be before Bootstrap)
12+
@import "common/utilities-custom.scss";
13+
1114
// Import Bootstrap configuration (mounted by core Bootstrap module)
1215
@import "bootstrap-dart.scss"; // note: modified for dart-sass
1316

‎assets/scss/app.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
@import "theme/variables.scss";
77
@import "common/icons.scss";
88

9+
// Import custom utilities (must be before Bootstrap)
10+
@import "common/utilities-custom.scss";
11+
912
// Import Bootstrap configuration (mounted by core Bootstrap module)
1013
@import "bootstrap.scss";
1114

‎assets/scss/common/_masonry.scss‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,5 @@
1616

1717
.m-col div {
1818
margin-top: calc(2 * var(--masonry-padding));
19-
border-radius: 5px;
19+
border-radius: #{$theme-border-radius} if($enable-important-utilities, !important, null);
2020
}
21-
22-
$utilities: map-merge(
23-
$utilities,
24-
(
25-
"m-col": (
26-
property: max-width,
27-
responsive: true,
28-
class: m-col,
29-
values: (
30-
1: 100%,
31-
2: 50%,
32-
3: 33.3%,
33-
4: 25%,
34-
5: 20%,
35-
)
36-
)
37-
)
38-
);

‎assets/scss/common/_styles.scss‎

Lines changed: 1 addition & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ div.rounded, img.rounded {
3131
margin-top: var(--overlay-offset);
3232
}
3333

34-
$utilities: map-merge(
35-
$utilities,
36-
(
37-
"cursor": (
38-
property: margin-left margin-right,
39-
class: mx,
40-
responsive: true,
41-
values: auto 0,
42-
)
43-
)
44-
);
45-
4634
.tickmark li::marker {
4735
content: "✓ ";
4836
}
@@ -52,48 +40,12 @@ $utilities: map-merge(
5240
color: transparent;
5341
}
5442

55-
.heading:hover .anchor
43+
.heading:hover .anchor
5644
{
5745
transition: 0.25s ease-in-out;
5846
color: $primary;
5947
}
6048

61-
$utilities: map-merge(
62-
$utilities,
63-
(
64-
"padding-start-wide": (
65-
property: padding-left,
66-
responsive: true,
67-
class: psw,
68-
values: (
69-
0: 0,
70-
1: 1.5 * $spacer,
71-
2: 3 * $spacer,
72-
3: 6 * $spacer,
73-
4: 9 * $spacer,
74-
5: 12 * $spacer,
75-
)
76-
),
77-
"padding-top-wide": (
78-
property: padding-top,
79-
responsive: true,
80-
class: ptw,
81-
values: (
82-
0: 0,
83-
1: 1.5 * $spacer,
84-
2: 3 * $spacer,
85-
3: 6 * $spacer,
86-
4: 9 * $spacer,
87-
5: 12 * $spacer,
88-
)
89-
),
90-
"font-size": map-merge(
91-
map-get($utilities, "font-size"),
92-
( responsive: true ),
93-
),
94-
)
95-
);
96-
9749
:root {
9850
--nav-height: 90px;
9951
}
@@ -116,52 +68,6 @@ $utilities: map-merge(
11668
}
11769
/* stylelint-enable media-feature-range-notation */
11870

119-
$utilities: map-merge(
120-
$utilities,
121-
(
122-
"padding-start-wide": (
123-
property: padding-left,
124-
responsive: true,
125-
class: psw,
126-
values: (
127-
0: 0,
128-
1: 1.5 * $spacer,
129-
2: 3 * $spacer,
130-
3: 6 * $spacer,
131-
4: 9 * $spacer,
132-
5: 12 * $spacer,
133-
)
134-
),
135-
"padding-top-wide": (
136-
property: padding-top,
137-
responsive: true,
138-
class: ptw,
139-
values: (
140-
0: 0,
141-
1: 1.5 * $spacer,
142-
2: 3 * $spacer,
143-
3: 6 * $spacer,
144-
4: 9 * $spacer,
145-
5: 12 * $spacer,
146-
)
147-
),
148-
"font-size": map-merge(
149-
map-get($utilities, "font-size"),
150-
( responsive: true ),
151-
)
152-
)
153-
);
154-
15571
.width-100 {
15672
width: 100%;
15773
}
158-
159-
$utilities: (
160-
"width": (
161-
property: width,
162-
responsive: true,
163-
values: (
164-
auto: auto
165-
)
166-
)
167-
);

‎assets/scss/common/_utilities-custom.scss‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// Custom Bootstrap utilities extensions
2+
// This file must be imported BEFORE bootstrap.scss to ensure utilities are processed
3+
4+
// Initialize utilities map if not already defined
5+
$utilities: () !default;
6+
7+
// Add custom masonry column utilities
8+
$utilities: map-merge(
9+
$utilities,
10+
(
11+
"m-col": (
12+
property: max-width,
13+
responsive: true,
14+
class: m-col,
15+
values: (
16+
1: 100%,
17+
2: 50%,
18+
3: 33.3%,
19+
4: 25%,
20+
5: 20%,
21+
)
22+
)
23+
)
24+
);
25+
26+
// Add custom margin utilities (mx auto/0)
27+
$utilities: map-merge(
28+
$utilities,
29+
(
30+
"cursor": (
31+
property: margin-left margin-right,
32+
class: mx,
33+
responsive: true,
34+
values: auto 0,
35+
)
36+
)
37+
);
38+
39+
// Add wide padding utilities (using hardcoded rem values since $spacer not yet available)
40+
$utilities: map-merge(
41+
$utilities,
42+
(
43+
"padding-start-wide": (
44+
property: padding-left,
45+
responsive: true,
46+
class: psw,
47+
values: (
48+
0: 0,
49+
1: 1.5rem,
50+
2: 3rem,
51+
3: 6rem,
52+
4: 9rem,
53+
5: 12rem,
54+
)
55+
),
56+
"padding-top-wide": (
57+
property: padding-top,
58+
responsive: true,
59+
class: ptw,
60+
values: (
61+
0: 0,
62+
1: 1.5rem,
63+
2: 3rem,
64+
3: 6rem,
65+
4: 9rem,
66+
5: 12rem,
67+
)
68+
),
69+
"width": (
70+
property: width,
71+
responsive: true,
72+
values: (
73+
auto: auto
74+
)
75+
)
76+
)
77+
);

‎component-library/bookshop.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
@import "modules/bookshop/shared/styles/global";
22
@import "modules/bookshop/components/about/about";
3+
@import "modules/bookshop/components/approach/approach";
34
@import "modules/bookshop/components/articles/articles";
45
@import "modules/bookshop/components/cards/cards";
56
@import "modules/bookshop/components/cta/cta";
67
@import "modules/bookshop/components/faq/faq";
78
@import "modules/bookshop/components/featured/featured";
89
@import "modules/bookshop/components/hero/hero";
910
@import "modules/bookshop/components/list/list";
11+
@import "modules/bookshop/components/menu/menu";
1012
@import "modules/bookshop/components/panels/panels";
1113
@import "modules/bookshop/components/releases/releases";
1214
@import "modules/bookshop/components/separator/separator";

‎component-library/components/approach/approach.bookshop.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Metadata about this component, to be used in the CMS
2+
spec:
3+
structures:
4+
- content_blocks
5+
label: Approach
6+
description: Approach section
7+
icon: step
8+
tags: []
9+
10+
# Defines the structure of this component, as well as the default values
11+
blueprint:
12+
heading:
13+
preheading:
14+
heading:
15+
content:
16+
align:
17+
width:
18+
cols:
19+
icon-rounded:
20+
icon-style:
21+
link-type:
22+
padding:
23+
background:
24+
backdrop:
25+
color:
26+
subtle:
27+
illustration:
28+
image:
29+
icon:
30+
ratio:
31+
class:
32+
anchor:
33+
mode:
34+
elements:
35+
- title:
36+
icon:
37+
image:
38+
mode:
39+
content:
40+
link:
41+
orientation:
42+
class:
43+
width:
44+
justify:
45+
align:
46+
fluid:
47+
theme:
48+
cover:

0 commit comments

Comments
 (0)