Skip to content

Commit 263a562

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/heading-overflow-in-small-screens
2 parents 376982d + bb6809a commit 263a562

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

content/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ block_content:
77
#### hero ####
88
title:
99

10-
We have been building <span class="has-text-forest-green">free software</span> at <span class="has-text-gold">Creative Commons (CC)</span> for over a decade.
10+
We have been building <span class="has-text-forest-green">free software</span> at <span class="has-text-orange">Creative Commons (CC)</span> for over a decade.
1111
----
1212
links:
1313

webpack/sass/home-page.scss

+5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
// Title styling within the hero section
66
.hero-title {
77
@extend .padding-horizontal-big;
8+
<<<<<<< HEAD
89
@media(max-width:530px) {
910
h1{
1011
font-size: 2.8rem;
1112
line-height: 1.2;
1213
}
14+
=======
15+
.has-text-orange{
16+
color:rgb(251 119 41);
17+
>>>>>>> origin/main
1318
}
1419
}
1520

0 commit comments

Comments
 (0)