mirror of
https://github.com/Ocelot-Social-Community/ocelot.social.git
synced 2026-01-20 20:01:24 +00:00
Merge branch 'master' into root-locales
This commit is contained in:
commit
cc039a465c
4
.github/workflows/test-build.yml
vendored
4
.github/workflows/test-build.yml
vendored
@ -8,10 +8,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4.1.7
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.1.7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v4.0.3
|
||||
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v4.0.3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
|
||||
|
||||
4
.github/workflows/test-lint.yml
vendored
4
.github/workflows/test-lint.yml
vendored
@ -8,10 +8,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4.1.7
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.1.7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v4.0.3
|
||||
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v4.0.3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v5.0.0
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
|
||||
|
||||
- name: Detect changed locale files
|
||||
id: filter
|
||||
|
||||
4
.github/workflows/vuepress-deploy.yml
vendored
4
.github/workflows/vuepress-deploy.yml
vendored
@ -10,10 +10,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4.1.7
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.1.7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v4.0.3
|
||||
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v4.0.3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
|
||||
|
||||
@ -6,8 +6,9 @@
|
||||
</a>
|
||||
</h3>
|
||||
<div class="donation-bar">
|
||||
<div class="donation-bar-value" :style="{ width: (currentValue / target) * 100 + '%' }">
|
||||
{{ currentValueStr }}
|
||||
<!-- a width of 100% is a bit more as the full width of "donation-bar" one can see if we don't set "overflow: hidden;". I couldn't find how to fix -->
|
||||
<div class="donation-bar-value" :style="{ width: ((currentValue <= target ? currentValue : target) / target) * 100 + '%' }">
|
||||
<span class="donation-bar-value-str">{{ currentValueStr }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
@ -128,6 +129,7 @@ const timeFrameStr = computed(() => {
|
||||
<style scoped>
|
||||
.donation-bar {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--notice-c-accent-bg);
|
||||
border-radius: 10px;
|
||||
margin: 20px 0 20px 0;
|
||||
@ -142,6 +144,10 @@ const timeFrameStr = computed(() => {
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.donation-bar-value-str{
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
@media (max-width: 830px) {
|
||||
.donation-bar-value {
|
||||
font-size: 1.5em;
|
||||
|
||||
@ -20,7 +20,7 @@ IBAN: DE81 5003 1000 1084 5340 01
|
||||
BIC: TRODDEF1
|
||||
Triodos Bank N.V., Deutschland
|
||||
|
||||
Ort: 86179 Augsburg, Deutschland
|
||||
Ort: Haferstr. 5c, 86179 Augsburg, Deutschland
|
||||
|
||||
### Hinweise zum Verwendungszweck
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@ description: "Hilf mit deiner Spende, dass Beiträge in Gruppen angepinnt werden
|
||||
Hilf mit deiner Spende, dass Beiträge in Gruppen angepinnt werden können.
|
||||
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### Worum geht es
|
||||
@ -58,11 +58,11 @@ Also auch über eine Spende von dir.
|
||||
|
||||
<!-- markdownlint-disable no-duplicate-heading -->
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### Spenden
|
||||
|
||||
@ -20,7 +20,7 @@ IBAN: DE81 5003 1000 1084 5340 01
|
||||
BIC: TRODDEF1
|
||||
Triodos Bank N.V., Germany
|
||||
|
||||
Location: 86179 Augsburg, Germany
|
||||
Location: Haferstr. 5c, 86179 Augsburg, Germany
|
||||
|
||||
### Notes on intended use
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@ description: "Help with your donation, toenable pinning posts in groups."
|
||||
Help enable pinning posts in groups with your donation.
|
||||
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### What it’s about
|
||||
@ -58,11 +58,11 @@ This includes donations from you.
|
||||
|
||||
<!-- markdownlint-disable no-duplicate-heading -->
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### Donations
|
||||
|
||||
@ -20,7 +20,7 @@ IBAN: DE81 5003 1000 1084 5340 01
|
||||
BIC: TRODDEF1
|
||||
Triodos Bank N.V., Alemania
|
||||
|
||||
Ubicación: 86179 Augsburg, Alemania
|
||||
Ubicación: Haferstr. 5c, 86179 Augsburg, Alemania
|
||||
|
||||
### Notas sobre el uso previsto
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@ description: "Ayuda con tu donación a que las publicaciones se puedan anclar en
|
||||
Ayuda con tu donación a que las publicaciones se puedan anclar en los grupos.
|
||||
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### De qué se trata
|
||||
@ -58,11 +58,11 @@ Es decir, también a través de tu donación.
|
||||
|
||||
<!-- markdownlint-disable no-duplicate-heading -->
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### Donaciones
|
||||
|
||||
@ -20,7 +20,7 @@ IBAN: DE81 5003 1000 1084 5340 01
|
||||
BIC: TRODDEF1
|
||||
Triodos Bank N.V., Allemagne
|
||||
|
||||
Lieu: 86179 Augsbourg, Allemagne
|
||||
Lieu: Haferstr. 5c, 86179 Augsbourg, Allemagne
|
||||
|
||||
### Remarques sur l’usage prévu
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@ description: "Aidez-nous à épingler des publications dans les groupes grâce
|
||||
Aidez-nous à épingler des publications dans les groupes grâce à votre don.
|
||||
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### De quoi s’agit-il ?
|
||||
@ -58,11 +58,11 @@ Donc aussi par vos dons.
|
||||
|
||||
<!-- markdownlint-disable no-duplicate-heading -->
|
||||
<DonationBar
|
||||
:currentValue="690"
|
||||
:currentValue="1330"
|
||||
:target="1200"
|
||||
startDate="2025-11-05"
|
||||
endDate="2026-01-02"
|
||||
asOfDate="2025-11-24"
|
||||
asOfDate="2025-12-15"
|
||||
/>
|
||||
|
||||
### Dons
|
||||
|
||||
736
package-lock.json
generated
736
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -25,12 +25,12 @@
|
||||
"@vuepress/bundler-vite": "2.0.0-rc.26",
|
||||
"@vuepress/plugin-slimsearch": "2.0.0-rc.118",
|
||||
"sass-embedded": "^1.91.0",
|
||||
"textlint": "^15.4.0",
|
||||
"textlint": "^15.5.0",
|
||||
"textlint-filter-rule-comments": "^1.2.2",
|
||||
"textlint-rule-apostrophe": "^3.0.0",
|
||||
"textlint-rule-common-misspellings": "^1.0.1",
|
||||
"textlint-rule-doubled-spaces": "^1.0.2",
|
||||
"textlint-rule-no-dead-link": "^6.0.1",
|
||||
"textlint-rule-no-dead-link": "^6.1.0",
|
||||
"textlint-rule-no-empty-element": "^0.3.1",
|
||||
"textlint-rule-no-empty-section": "^1.1.0",
|
||||
"textlint-rule-no-start-duplicated-conjunction": "^2.0.2",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user