@concretecms/bedrock 1.3.5 → 1.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,25 +1,40 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// Note - ideally these font families should be handled by Bootstrap but when using with
|
|
2
|
+
// A bootstrap theme the font family from the theme can sometimes take precedence. So let's
|
|
3
|
+
// redeclare it here as well.
|
|
4
|
+
body div.ccm-ui {
|
|
5
|
+
h1,
|
|
6
|
+
.h1 {
|
|
7
|
+
font-family: $headings-font-family;
|
|
3
8
|
font-weight: bold;
|
|
4
9
|
}
|
|
5
10
|
|
|
6
|
-
h2
|
|
11
|
+
h2,
|
|
12
|
+
.h2 {
|
|
13
|
+
font-family: $headings-font-family;
|
|
7
14
|
font-weight: bold;
|
|
8
15
|
}
|
|
9
16
|
|
|
10
|
-
h3
|
|
17
|
+
h3,
|
|
18
|
+
.h3 {
|
|
19
|
+
font-family: $headings-font-family;
|
|
11
20
|
font-weight: 300;
|
|
12
21
|
}
|
|
13
22
|
|
|
14
|
-
h4
|
|
23
|
+
h4,
|
|
24
|
+
.h4 {
|
|
25
|
+
font-family: $headings-font-family;
|
|
15
26
|
font-weight: 700;
|
|
16
27
|
}
|
|
17
28
|
|
|
18
|
-
h5
|
|
29
|
+
h5,
|
|
30
|
+
.h5 {
|
|
31
|
+
font-family: $headings-font-family;
|
|
19
32
|
font-weight: 600;
|
|
20
33
|
}
|
|
21
34
|
|
|
22
|
-
h6
|
|
35
|
+
h6,
|
|
36
|
+
.h6 {
|
|
37
|
+
font-family: $headings-font-family;
|
|
23
38
|
font-weight: normal;
|
|
24
39
|
text-transform: uppercase;
|
|
25
40
|
}
|
|
@@ -27,6 +27,14 @@ $primary: #4a90e2;
|
|
|
27
27
|
$body-color: $gray-700;
|
|
28
28
|
$small-font-size: 0.9rem;
|
|
29
29
|
$text-muted: $gray-500;
|
|
30
|
+
// Note, this is the same as $font-family-sans-serif, but we need to explicitly declare it, and since this
|
|
31
|
+
// file is parsed before the bootstrap variables file we don't have access to that variable yet. We have to
|
|
32
|
+
// explicitly define headings-font-family because when the CMS css file is used with Bedrock themes that
|
|
33
|
+
// variable will probably be defined and we will have theme h1, h2 styles bleeding through into our styles.
|
|
34
|
+
// So in order to do that, let's set our own sans serif variable here:
|
|
35
|
+
$font-family-sans-serif: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', 'Liberation Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji' !default;
|
|
36
|
+
// That variable will be used in Bootstrap. And then we can reference it here.
|
|
37
|
+
$headings-font-family: $font-family-sans-serif;
|
|
30
38
|
|
|
31
39
|
/* horizontal rules */
|
|
32
40
|
$hr-color: $gray-200;
|
package/package.json
CHANGED