tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,668 Commits 5 Branches 0 Tags
ecbfaeea1d50a660855e1a9429d7d5545ccc3e23
Commit Graph
15 Commits
Author SHA1 Message Date
root ecbfaeea1d Migrate Modern theme to separate Flavour 2026-09-18 04:37:36 -04:00
root ef8caa856b Re-add Modern theme, with color variants 2026-09-18 04:37:36 -04:00
Tarrien 4a5c59aa1d Wobbl customizations on Glitch-SOC 2026-09-18 04:37:36 -04:00
Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Claire 1ca3894048 Replace old glitch-soc themes by the new ones 2025-12-02 21:04:31 +01:00
Claire 2e543ff246 Port new refactored themes to glitch-soc (#3296) 2025-11-30 16:37:40 +01:00
Claire 80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
 2025-06-12 20:32:25 +02:00
Claire f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Echo 3bfc576a49 [Glitch] Fix SASS deprecation notices 
Port 8a3bed1933 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-27 21:29:33 +01:00
Claire 8a34c42341 Rename app/javascript/flavours/glitch/styles/index.scss to application.scss 
This is just to reduce differences with upstream.
 2024-04-30 21:03:04 +02:00
Claire c3e12a4dfa Change how theme style packs are loaded 
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
 2024-04-28 15:45:41 +02:00
Michal Dvorak 859db01268 initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
otrapersona 29870d2be6 Glitchsoc translation to 'es' language (#1439) 
glitch-soc-specific translation to 'es' language
 2020-10-19 22:17:29 +02:00
Thibaut Girka 8f3402b1f0 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
Thibaut Girka f7a076eded [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00