FSFE/fsfe-website
30
33
Fork 97
Code Issues 65 Pull Requests 20 Wiki Activity

Fix/timeline feedback #5930

Merged
tobiasd merged 18 commits from fix/timeline-feedback into master 2026-06-17 11:36:09 +00:00
Conversation 2 Commits 18 Files Changed 5
+52 -27
silviarbgl commented 2026-06-15 14:08:46 +00:00
Member
Copy Link
Copy Source
No description provided.
silviarbgl added 12 commits 2026-06-15 14:08:49 +00:00
restore translate files
continuous-integration/drone/pr Build is failing
Details
0f298cbcda 
I had to restore some files that I committed by mistake and they shouldn't be in this PR.
update files of timeline a3029542a7
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website 3e49ba4961
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website 71ab073435
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website b01750286c
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website a9ec77e62f
resolve conflicts in timeline files 8d39287863
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website 9af25ec544
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website 015cfce5f6
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website f082c86b29
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website fe847db8ce
fix: add missing events, fix typos and links
continuous-integration/drone/pr Build is passing
Details
927257164b
silviarbgl added 1 commit 2026-06-15 14:25:18 +00:00
fix: add missing events, fix typos and links
continuous-integration/drone/pr Build is passing
Details
422d65f29b
silviarbgl added 1 commit 2026-06-16 06:43:12 +00:00
fix: add missing events
continuous-integration/drone/pr Build is passing
Details
3285fee5e5
silviarbgl marked the pull request as ready for review 2026-06-16 06:48:53 +00:00
tobiasd reviewed 2026-06-16 08:25:20 +00:00
fsfe.org/about/timeline/index.en.xhtml Outdated
@@ -14,2 +14,2 @@
<a href="/contribute/contribute.html">our Supporters</a>, and
<a href="/donate/thankgnus.html">our corporate donors</a> FSFE has been
<a href="/contribute/contribute.html">our supporters</a>, and
<a href="/donate/thankgnus.html">our donors</a> FSFE has been
tobiasd commented 2026-06-16 08:25:17 +00:00
Owner
Copy Link
Copy Source

I think it is "the FSFE" right @anaghz ?

I think it is "the FSFE" right @anaghz ?
tobiasd marked this conversation as resolved
tobiasd reviewed 2026-06-16 08:27:13 +00:00
fsfe.org/about/timeline/index.en.xhtml Outdated
@@ -27,1 +22,3 @@
Generation" 👾, plus "Organisational Development" 🤝. </p>
<p>
In the timeline we differ between the FSFE's activity frames
"Device Neutrality" ♺, "Legal Education" ⚖, "Market Regulations" 🗳
tobiasd commented 2026-06-16 08:27:10 +00:00
Owner
Copy Link
Copy Source

The icons have been removed from the cell blocks of the events, I think we should remove them in the text as well. We should reference the color instead - maybe a border bottom in that color underneath the label?

The icons have been removed from the cell blocks of the events, I think we should remove them in the text as well. We should reference the color instead - maybe a border bottom in that color underneath the label?
silviarbgl commented 2026-06-16 12:12:37 +00:00
Author
Member
Copy Link
Copy Source

I remove them and add the border bottom that we talk about. I also add in the

tag, the id=content, so the headline of the timeline follows the same structure that we always have.

I remove them and add the border bottom that we talk about. I also add in the <main> tag, the id=content, so the headline of the timeline follows the same structure that we always have.
tobiasd marked this conversation as resolved
silviarbgl added 1 commit 2026-06-16 11:43:35 +00:00
style: remove icons and add border-bottom into the tags
continuous-integration/drone/pr Build is failing
Details
7a9d8d1c0e
silviarbgl added 2 commits 2026-06-17 10:15:13 +00:00
Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website 9c7060d5c9
fix: colors of tags, add event and fix typos
continuous-integration/drone/pr Build is failing
Details
8652858458
tobiasd added 1 commit 2026-06-17 11:33:04 +00:00
fix tag closure
continuous-integration/drone/pr Build is passing
Details
de1b96ff3d
tobiasd merged commit 4d6ed29271 into master 2026-06-17 11:36:09 +00:00
tobiasd deleted branch fix/timeline-feedback 2026-06-17 11:36:12 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
tobiasd
Labels
Clear labels
Accessibility
bug
build
cgi Scripting
design
disruptive
Requires careful coordination and documentation changes
 documentation
duplicate
easy
enhancement
Improving what is already there
 feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
albert (Albert Dengg) alex.busch (alex.busch) alex.sander (alex.sander) anaghz (anaghz) annarita.russo (annarita.russo) ao (André Ockers) bonnie (bonnie) ciampix (Marco Ciampa) cryptie (cryptie) dario (dario) delliott (delliott) dfajfer (Damian Fajfer) dmaphy (Dominic Hopf) doczkal (Thomas Doczkal) eal (eal) egnun (Erik Grun) eventregbot (eventregbot) fi (fi) floriansnow (Florian Snow) gabriel.ku (gabriel.ku) guido (guido) hf (hf) hugo (hugo) ineiev (ineiev) jithendra (jithendra) jn (jn) jzarl (jzarl) linus (Linus Sehn) lucabon (Luca Bonissi) lucas.lasota (lucas.lasota) max.mehl (Max Mehl) mk (Matthias Kirschner) monochromec (monochromec) mweimann (Michael Weimann) nico.rikken (nico.rikken) patrick (Patrick Ohnewein) reinhard (Reinhard Müller) renovate-bot (Renovate Bot) repentinus (Heiki Lõhmus) schiessle (Björn Schießle) silviarbgl (Silvia Rbgl) sofiaritz (Sofía Aritz) tobiasd (tobiasd) vincent (vincent)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#5930
Delete Branch "fix/timeline-feedback"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?