Skip to content

Commit 93a3e12

Browse files
josecelanojosecelano
committed
Merge #85: fix github issues
ebca183 fix github issues (Graeme Byrne) Pull request description: * In order to prevent long URLs in links and list items from overflowing the page, add : ``` word-wrap: break-word; word-break: break-all; overflow-wrap: break-word; white-space: normal; ``` * Remove `word-break: break-all;` from links and list items which don't require it. * [Highlight ToC #81](#81) * [Build error: TypeError: Cannot read properties of undefined (reading 'relatedPosts') #80](#80) * [Ask the designer how to implement a link inside a key feature card #42](#42) * [Enable second level of indentation in TableOfContents section #58](#58) * [v1 error page in v2 #71](#71) * [Fake links in homepage #84](#84) ACKs for top commit: josecelano: ACK ebca183 Tree-SHA512: 6536a66c42e4876ab6b5aebf7f68405441420eee2b87ff1887ffcbd2a09ac7ed1e588e563075476a2b51f4abe4b046e4947959e0c9f408de99b9057d5aa14f74
2 parents fd1e62c + ebca183 commit 93a3e12

14 files changed

+105
-38
lines changed

‎src/lib/components/atoms/Button.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
6969
&.color {
7070
&--primary {
71-
--main-color: var(--color--primary-rgb);
72-
--light-color: var(--color--primary-tint-rgb);
71+
--main-color: 255, 49, 0;
72+
--light-color: rgba(255, 100, 100, 0.5);
7373
--contrast-color: var(--color--primary-contrast);
7474
}
7575
&--secondary {

‎src/lib/components/atoms/Card.svelte

-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
border: 1px solid rgba(245, 245, 245, 0.08);
2121
padding: 1.5rem;
2222
border-radius: 1.5rem;
23-
transition: box-shadow 0.3s ease;
24-
25-
&:hover {
26-
background: rgba(0, 0, 0, 0.2);
27-
box-shadow: 0 0 0 3px rgba(255, 49, 0, 1);
28-
cursor: pointer;
29-
}
3023
3124
span {
3225
width: 24px;

‎src/lib/components/atoms/Slider.svelte

+16-14
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@
99

1010
<div class="slider-container">
1111
{#each titleArr as item}
12-
<div class={item.link ? 'has-link' : ''}>
13-
{#if item.link}
14-
<a href={item.link} target="_blank" rel="noopener noreferrer">
12+
{#if item.link}
13+
<a href={item.link} target="_blank" rel="noopener noreferrer">
14+
<div class={item.link ? 'has-link' : ''}>
1515
<p>{item.title}</p>
16-
</a>
17-
{:else}
16+
</div>
17+
</a>
18+
{:else}
19+
<div class={item.link ? 'has-link' : ''}>
1820
<p>{item.title}</p>
19-
{/if}
20-
</div>
21+
</div>
22+
{/if}
2123
{/each}
2224
</div>
2325

@@ -26,12 +28,13 @@
2628
2729
.slider-container {
2830
display: flex;
31+
gap: 1rem;
2932
overflow-x: auto;
3033
width: 100vw;
31-
margin: 3rem 0 0 0;
32-
gap: 1rem;
33-
scroll-behavior: smooth;
34+
margin: 3rem 0rem 0 0rem;
35+
padding-inline: 1.5rem;
3436
padding-bottom: 1rem;
37+
scroll-behavior: smooth;
3538
box-sizing: border-box;
3639
position: relative;
3740
left: 0;
@@ -48,11 +51,10 @@
4851
background-color: rgba(255, 49, 0, 0.8);
4952
box-sizing: border-box;
5053
border: 2px solid transparent;
54+
}
5155
52-
a {
53-
color: rgba(245, 245, 245, 0.96);
54-
margin-top: auto;
55-
}
56+
a {
57+
color: rgba(245, 245, 245, 0.96);
5658
}
5759
5860
div.has-link:hover {

‎src/lib/components/atoms/TableOfContents.svelte

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
});
2525
},
26-
{ threshold: 0.5 }
26+
{ threshold: 0.9 }
2727
);
2828
2929
sections.forEach((section) => {
@@ -90,6 +90,7 @@
9090
color: rgba(245, 245, 245, 0.96);
9191
font-size: 0.875rem;
9292
text-decoration: none;
93+
word-break: keep-all;
9394
9495
&:hover {
9596
color: rgba(255, 49, 0, 0.96);

‎src/lib/components/singletons/PrevNextPost.svelte

+4
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
text-align: left;
8080
}
8181
82+
a {
83+
word-break: keep-all;
84+
}
85+
8286
.arrow {
8387
display: flex;
8488
align-items: center;

‎src/lib/components/singletons/TorrustIndexPost.svelte

+10-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@
1414
]
1515
},
1616
{ name: 'Roadmap', id: 'roadmap' },
17-
{ name: 'License', id: 'license' }
17+
{
18+
name: 'License',
19+
id: 'license',
20+
subsections: [
21+
{ name: 'Copyright', id: 'copyright' },
22+
{ name: 'Legacy Exception', id: 'legacyException' }
23+
]
24+
}
1825
];
1926
2027
let activeSection = '';
@@ -193,7 +200,7 @@ cd /tmp \
193200

194201
<p></p>
195202

196-
<h3>Copyright</h3>
203+
<h3 id="copyright">Copyright</h3>
197204

198205
<p>
199206
This program is free software: you can redistribute it and/or modify it under the terms of the <a
@@ -221,7 +228,7 @@ cd /tmp \
221228

222229
<p></p>
223230

224-
<h3>Legacy Exception</h3>
231+
<h3 id="legacyException">Legacy Exception</h3>
225232

226233
<p>
227234
For prosperity, versions of Torrust Tracker that are older than five years are automatically

‎src/lib/components/singletons/TorrustTrackerPost.svelte

+10-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
{ name: 'Build from sources', id: 'buildSources' },
1010
{ name: 'Run with docker', id: 'docker' },
1111
{ name: 'Roadmap', id: 'roadmap' },
12-
{ name: 'License', id: 'license' }
12+
{
13+
name: 'License',
14+
id: 'license',
15+
subsections: [
16+
{ name: 'Copyright', id: 'copyright' },
17+
{ name: 'Legacy Exception', id: 'legacyException' }
18+
]
19+
}
1320
];
1421
1522
let activeSection = '';
@@ -205,7 +212,7 @@ cd /tmp \
205212

206213
<p></p>
207214

208-
<h3>Copyright</h3>
215+
<h3 id="copyright">Copyright</h3>
209216

210217
<p>
211218
This program is free software: you can redistribute it and/or modify it under the terms of the <a
@@ -233,7 +240,7 @@ cd /tmp \
233240

234241
<p></p>
235242

236-
<h3>Legacy Exception</h3>
243+
<h3 id="legacyException">Legacy Exception</h3>
237244

238245
<p>
239246
For prosperity, versions of Torrust Tracker that are older than five years are automatically

‎src/lib/components/singletons/WhyContribute.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<div class="container">
88
<div class="contribute-container">
9-
<h2>Why to contribute?</h2>
9+
<h2>Why should you contribute?</h2>
1010
<p>
1111
Our project is designed to push the boundaries of decentralized technology, providing a
1212
robust, open-source BitTorrent tracker and index. By contributing, you’re helping build tools

‎src/lib/scss/_base.scss

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ ol {
1111

1212
li {
1313
margin: 6px 0;
14+
word-wrap: break-word;
15+
word-break: break-all;
16+
overflow-wrap: break-word;
17+
white-space: normal;
1418

1519
&::marker {
1620
color: var(--color--primary);

‎src/lib/scss/global.scss

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ body {
3434

3535
a {
3636
color: rgba(255, 49, 0, 0.96);
37+
word-wrap: break-word;
38+
word-break: break-all;
39+
overflow-wrap: break-word;
40+
white-space: normal;
3741
}
3842

3943
html {

‎src/routes/(pages)/about/+page.svelte

+23-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,29 @@
44
55
// Array of section objects with display names and IDs
66
let sections = [
7-
{ name: 'Why BitTorrent?', id: 'bitTorrent' },
8-
{ name: 'Why Torrust', id: 'whyTorrust' },
7+
{
8+
name: 'Why BitTorrent?',
9+
id: 'bitTorrent',
10+
subsections: [
11+
{ name: 'Why does the BitTorrent protocol still matter?', id: 'bitTorrentProtocol' },
12+
{ name: 'Efficiency and scalability', id: 'efficiency' },
13+
{ name: 'Current use cases', id: 'currentUses' },
14+
{ name: 'Future use cases', id: 'futureUses' },
15+
{ name: 'BT vs. IPFS', id: 'btIpfs' },
16+
{ name: 'Conclusion', id: 'conclusion' }
17+
]
18+
},
19+
{
20+
name: 'Why Torrust',
21+
id: 'whyTorrust',
22+
subsections: [
23+
{ name: 'Performance & Efficiency', id: 'performanceEfficiency' },
24+
{ name: 'Security & Reliability', id: 'securityReliability' },
25+
{ name: 'User Experience & Accessibility', id: 'userExperience' },
26+
{ name: 'Future use cases', id: 'futureUses' },
27+
{ name: 'Integration & Interoperability', id: 'integration' }
28+
]
29+
},
930
{ name: 'The Team', id: 'team' },
1031
{ name: 'Contributors', id: 'contributors' },
1132
{ name: 'Sponsors', id: 'sponsors' }

‎src/routes/(pages)/community/+page.svelte

+21-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,28 @@
33
44
// Array of section objects with display names and IDs
55
let sections = [
6-
{ name: 'Why Contribute to our Project?', id: 'whyContribute' },
6+
{
7+
name: 'Why Contribute to our Project?',
8+
id: 'whyContribute',
9+
subsections: [
10+
{ name: 'Embrace Rust: a language of choice', id: 'embraceRust' },
11+
{ name: 'Prioritizing Code Quality', id: 'codeQuality' },
12+
{ name: 'A welcoming community for newcomers', id: 'welcomingCommunity' },
13+
{ name: 'Influence the Project’s Future', id: 'influenceDirection' },
14+
{ name: 'Join us today', id: 'joinUs' }
15+
]
16+
},
717
{ name: 'How to contribute?', id: 'howContribute' },
8-
{ name: 'Torrent Knowledge Base', id: 'knowledgeBase' },
18+
{
19+
name: 'Torrent Knowledge Base',
20+
id: 'knowledgeBase',
21+
subsections: [
22+
{ name: 'What Are Torrents?', id: 'whatAreTorrents' },
23+
{ name: 'What Is a Tracker?', id: 'whatIsTracker' },
24+
{ name: 'What Is a Torrent Index?', id: 'whatIsTorrentIndex' },
25+
{ name: 'List of projects using BitTorrent', id: 'listOfProjects' }
26+
]
27+
},
928
{ name: 'Resources', id: 'resources' }
1029
];
1130

‎src/routes/(pages)/torrent-index/+page.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
126126
.slider-content {
127127
width: 100%;
128-
max-width: 2070px;
128+
max-width: 2100px;
129129
display: flex;
130130
justify-content: center;
131131
}

‎src/routes/+error.svelte

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,21 @@
2121

2222
<style lang="scss">
2323
.error-page {
24-
background: var(--color--page-background);
2524
position: relative;
25+
background: rgba(245, 245, 245, 0.08);
26+
display: flex;
27+
align-items: center;
28+
justify-content: center;
2629
}
2730
.container {
2831
display: flex;
2932
flex-direction: column;
3033
align-items: center;
3134
justify-content: center;
32-
min-height: 60vh;
35+
min-height: 80vh;
3336
text-align: center;
37+
max-width: 500px;
38+
padding-inline: 1.5rem;
3439
3540
.svg-wrapper {
3641
width: 300px;

0 commit comments

Comments
 (0)