Skip to content

Commit 8441a64

Browse files
committed
Enhance multi-column layout support and update Font Awesome CDN links in theme styles
1 parent e599262 commit 8441a64

File tree

4 files changed

+70
-14
lines changed

4 files changed

+70
-14
lines changed

slides/Slides.md

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ Use `![center]` alt text to center images
6565

6666
---
6767

68-
<!-- _class: columns -->
68+
# Two-Column Layout
6969

70-
## Columns Layout
70+
<div class="columns">
7171

7272
<div>
7373

74-
### Left Column
74+
## Left Column
7575

7676
- Point 1
7777
- Point 2
@@ -80,13 +80,32 @@ Use `![center]` alt text to center images
8080
</div>
8181
<div>
8282

83-
### Right Column
83+
## Right Column
8484

8585
- Point A
8686
- Point B
8787
- Point C
8888

8989
</div>
90+
</div>
91+
92+
---
93+
94+
<!-- _class: columns -->
95+
96+
# Two-Column Layout (Class)
97+
98+
## Left Column
99+
100+
- Point 1
101+
- Point 2
102+
- Point 3
103+
104+
## Right Column
105+
106+
- Point A
107+
- Point B
108+
- Point C
90109

91110
---
92111

slides/themes/custom-default.css

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* @theme custom-default */
33

44
@import 'default';
5-
@import 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css';
5+
@import 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.2.0/css/all.min.css';
66

77
/* Theme customization via CSS variables (Marp v4+ best practice) */
88
:root {
@@ -55,20 +55,57 @@ section.small h2 {
5555
font-size: 1.4em;
5656
}
5757

58-
/* Multi-column layouts using CSS Grid */
58+
/* Multi-column layouts */
5959
/* Method 1: Using section class (<!-- _class: columns -->) */
6060
section.columns {
6161
display: grid;
62-
grid-template-columns: repeat(2, minmax(0, 1fr));
63-
gap: 1rem;
64-
align-items: start;
62+
grid-template-columns: repeat(2, 1fr);
63+
grid-template-rows: auto auto auto;
64+
grid-auto-flow: column;
65+
gap: 0 2rem;
66+
align-content: center;
67+
}
68+
69+
section.columns > h1 {
70+
grid-column: 1 / -1;
71+
grid-row: 1;
72+
}
73+
74+
/* Preserve Marp footer and pagination positioning */
75+
section.columns > footer {
76+
grid-column: 1 / -1;
77+
position: absolute;
78+
bottom: 30px;
79+
width: 100%;
80+
}
81+
82+
section.columns::after {
83+
position: absolute;
6584
}
6685

6786
section.columns3 {
6887
display: grid;
69-
grid-template-columns: repeat(3, minmax(0, 1fr));
70-
gap: 1rem;
71-
align-items: start;
88+
grid-template-columns: repeat(3, 1fr);
89+
grid-template-rows: auto auto auto;
90+
grid-auto-flow: column;
91+
gap: 0 2rem;
92+
align-content: center;
93+
}
94+
95+
section.columns3 > h1 {
96+
grid-column: 1 / -1;
97+
grid-row: 1;
98+
}
99+
100+
section.columns3 > footer {
101+
grid-column: 1 / -1;
102+
position: absolute;
103+
bottom: 30px;
104+
width: 100%;
105+
}
106+
107+
section.columns3::after {
108+
position: absolute;
72109
}
73110

74111
/* Method 2: Using div wrapper (<div class="columns">) */

slides/themes/custom-gaia.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* @theme custom-gaia */
33

44
@import 'gaia';
5-
@import 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css';
5+
@import 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.2.0/css/all.min.css';
66

77
/* Theme customization via CSS variables (Marp v4+ best practice) */
88
:root {

slides/themes/custom-uncover.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* @theme custom-uncover */
33

44
@import 'uncover';
5-
@import 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css';
5+
@import 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.2.0/css/all.min.css';
66

77
/* Theme customization via CSS variables (Marp v4+ best practice) */
88
:root {

0 commit comments

Comments
 (0)