Skip to content

Commit c7171c8

Browse files
airweenairween
authored
Merge pull request #118 from owasp-modsecurity/chore/upgradecomps
chore: change deprecated sass functions and warnings
2 parents ebde3bc + 194d5b1 commit c7171c8

13 files changed

Lines changed: 41 additions & 42 deletions

File tree

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
build:
3737
runs-on: ubuntu-latest
3838
env:
39-
HUGO_VERSION: 0.123.8
39+
HUGO_VERSION: 0.152.2
4040
steps:
4141
- name: Install Hugo CLI
4242
run: |

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
syntax-check:
2020
runs-on: ubuntu-latest
2121
env:
22-
HUGO_VERSION: 0.123.8
22+
HUGO_VERSION: 0.152.2
2323
steps:
2424
- name: Install Hugo CLI
2525
run: |

‎assets/scss/_blog.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
color: #000;
2424
font-family: Nunito;
2525
font-size: 14px;
26-
@media (min-width: 600px) {
27-
font-size: 16px;
28-
}
2926
font-style: normal;
3027
font-weight: 700;
3128
line-height: 150%;
3229
letter-spacing: 2.1px;
3330
text-transform: uppercase;
3431
margin-right: 5px;
32+
@media (min-width: 600px) {
33+
font-size: 16px;
34+
}
3535
}
3636
svg {
3737
fill: var(--primary-400);

‎assets/scss/_footer.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
.footer {
22
// Space from content.
33
margin-top: 70px;
4+
padding-top: 60px;
5+
padding-bottom: 60px;
6+
background-color: var(--crs-blue);
7+
color: var(--footer-link-color);
48
@media (min-width: $min-desktop) {
59
margin-top: 100px;
610
}
7-
padding-top: 60px;
8-
padding-bottom: 60px;
911
@media (min-width: $min-desktop) {
1012
padding-top: 100px;
1113
padding-bottom: 100px;
1214
}
13-
background-color: var(--crs-blue);
14-
color: var(--footer-link-color);
1515

1616
a {
1717
color: var(--footer-link-color);
@@ -89,14 +89,14 @@
8989

9090
.social-links {
9191
margin-top: 20px;
92-
@media (min-width: $min-desktop) {
93-
margin-top: 0;
94-
}
9592
display: flex;
9693
flex-wrap: wrap;
9794
align-items: center;
9895
justify-content: center;
9996
gap: 20px;
97+
@media (min-width: $min-desktop) {
98+
margin-top: 0;
99+
}
100100
a {
101101
display: flex;
102102
align-items: center;

‎layouts/partials/head/css.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
{{ else }}
99
{{ $options = merge $options (dict "outputStyle" "nested" "enableSourceMap" true) }}
1010
{{ end }}
11-
{{ $style := resources.Get $source | resources.ExecuteAsTemplate "scss/template.scss" . | resources.ToCSS $options | resources.PostCSS (dict "config" "postcss.config.js") | resources.Fingerprint "sha512" }}
11+
{{ $style := resources.Get $source | resources.ExecuteAsTemplate "scss/template.scss" . | css.Sass $options | css.PostCSS (dict "config" "postcss.config.js") | resources.Fingerprint "sha512" }}
1212
<link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}" media="all">

‎themes/dot-org-hugo-theme/assets/scss/_accordion.scss‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919
> h2 {
2020
margin-block-start: 0;
2121
margin-block-end: 0;
22-
2322
line-height: 26px;
2423
font-size: 20px;
25-
@media (min-width: $min-desktop) {
26-
font-size: 30px;
27-
line-height: 50px;
28-
}
2924
text-transform: none;
3025
color: var(--text-color);
3126
font-family: var(--rounded-font-family);
@@ -34,6 +29,10 @@
3429
padding-top: 34px;
3530
padding-bottom: 34px;
3631
margin-inline-end: 34px;
32+
@media (min-width: $min-desktop) {
33+
font-size: 30px;
34+
line-height: 50px;
35+
}
3736
@media (min-width: $min-desktop) {
3837
padding-top: 40px;
3938
padding-bottom: 40px;
@@ -76,10 +75,10 @@
7675

7776
.accordion__content {
7877
margin-bottom: 34px;
78+
opacity: 1;
7979
@media (min-width: $min-desktop) {
8080
margin-bottom: 40px;
8181
}
82-
opacity: 1;
8382
}
8483
}
8584
}

‎themes/dot-org-hugo-theme/assets/scss/_breadcrumb.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
.breadcrumb {
22
margin-block-start: 70px;
33
margin-block-end: 0;
4-
@media (min-width: $desktop-width) {
5-
margin-block-start: 100px;
6-
margin-block-end: 0;
7-
}
84
font-family: Nunito;
95
font-size: 14px;
10-
@media (min-width: 600px) {
11-
font-size: 16px;
12-
}
136
font-style: normal;
147
font-weight: 700;
158
line-height: 150%;
169
letter-spacing: 2.1px;
1710
text-transform: uppercase;
11+
@media (min-width: $desktop-width) {
12+
margin-block-start: 100px;
13+
margin-block-end: 0;
14+
}
15+
@media (min-width: 600px) {
16+
font-size: 16px;
17+
}
1818
a {
1919
text-decoration: none;
2020
color: var(--gray-800);

‎themes/dot-org-hugo-theme/assets/scss/_footer.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
.footer {
22
// Space from content.
33
margin-top: 70px;
4+
padding-top: 60px;
5+
padding-bottom: 60px;
6+
background-color: var(--black);
7+
color: var(--footer-link-color);
48
@media (min-width: $min-desktop) {
59
margin-top: 100px;
610
}
7-
padding-top: 60px;
8-
padding-bottom: 60px;
911
@media (min-width: $min-desktop) {
1012
padding-top: 100px;
1113
padding-bottom: 100px;
1214
}
13-
background-color: var(--black);
14-
color: var(--footer-link-color);
1515

1616
a {
1717
color: var(--footer-link-color);

‎themes/dot-org-hugo-theme/assets/scss/_header.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
position: relative;
77
&.sticky {
88
position: sticky;
9+
top: 0;
10+
left: 0;
11+
right: 0;
912
// remove sticky on smaller screens.
1013
@media (min-width: 515px) and (max-height: 615px) {
1114
position: relative;
1215
}
13-
top: 0;
14-
left: 0;
15-
right: 0;
1616
}
1717
&:after {
1818
content: "";

‎themes/dot-org-hugo-theme/assets/scss/_language-selector.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
&::after {
3939
// opening menu.
4040
transition: transform 0.1s ease-in;
41+
transform: rotate(180deg) translateY(-50%);
4142
@media (prefers-reduced-motion: reduce) {
4243
transition: none;
4344
}
44-
transform: rotate(180deg) translateY(-50%);
4545
}
4646
}
4747
}
@@ -61,10 +61,10 @@
6161
line-height: 40px;
6262
vertical-align: middle;
6363
padding-right: 20px; // min space for word and chevron.
64+
transition: color 0.5s ease;
6465
@media (min-width: $min-desktop) {
6566
padding-right: 10px; // as per other menu items.
6667
}
67-
transition: color 0.5s ease;
6868
@media (prefers-reduced-motion: reduce) {
6969
transition: none;
7070
}

0 commit comments

Comments
 (0)