Jeremy Kescher
1fb6e312ff
Merge remote-tracking branch 'upstream/main' into develop
2023-04-27 08:59:13 +02:00
Plastikmensch
678480d4d3
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch
aea7866161
Change drawer--header to drawer__header ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Jeremy Kescher
f3953eee78
Merge remote-tracking branch 'upstream/main' into develop
2023-04-23 20:49:47 +02:00
Eugen Rochko
2f3dffb057
[Glitch] Add progress indicator to sign-up flow
...
Port e5c0b16735
2023-04-22 10:18:20 +02:00
Jeremy Kescher
3866d53b95
Merge remote-tracking branch 'upstream/main' into develop
2023-04-21 15:05:02 +02:00
Claire
a3c05640f7
[Glitch] Add “In Memoriam” banner back to profiles
...
Port 86ad43173f
2023-04-16 18:02:16 +02:00
Claire
cb0562f32c
[Glitch] Fix tab arrows on RTL layouts
...
Port af49d93fd6
2023-04-16 17:58:32 +02:00
Plastikmensch
f28942cef9
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port babd86e59445848d6547
2023-04-16 17:45:18 +02:00
Jeremy Kescher
1e866e57ac
Merge remote-tracking branch 'upstream/main' into develop
2023-04-10 08:14:20 +02:00
Christian Schmidt
53cdcce3d1
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port 9ef9974ff2
2023-04-09 12:10:01 +02:00
Nick Schonning
b756e49cf1
[Glitch] Enable Stylelint property-no-unknown
...
Port cd14f712ad
2023-04-09 12:05:55 +02:00
Christian Schmidt
df6602ede1
[Glitch] Fix account header image missing in low-res
...
Port d7b8c6db7e
2023-04-09 12:01:55 +02:00
Jeremy Kescher
198d0b2ed4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2023-04-04 15:26:23 +02:00
Rubicon Rowe
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2023-04-04 12:51:24 +02:00
Jeremy Kescher
4ec0bd126b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2023-03-23 11:18:01 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
Jeremy Kescher
24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version
...
Conflicts:
- .github/workflows/build-image.yml
We're not building an image with GitHub Actions.
2023-03-17 07:27:28 +01:00
Jeremy Kescher
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
2023-03-15 14:13:29 +01:00
Rodion Borisov
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
Claire
7f3b0dedeb
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
2023-03-05 12:34:16 +01:00
Claire
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
Claire
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
Tim Lucas
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2023-02-25 14:43:24 +01:00
Botao Wang
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2023-02-25 14:40:29 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Nick Schonning
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2023-02-18 16:02:12 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
2023-02-17 00:26:21 +01:00
cadars
5e37906083
[Glitch] Add scrolling to Compare history modal
...
Port e8cb3ee827
2023-02-09 13:03:41 +01:00
Jeremy Kescher
27fdb81b65
Merge remote-tracking branch 'upstream/main' into develop
2023-01-27 00:36:49 +01:00
Claire
d9a078e6d3
Add role badges to WebUI ( #2096 )
...
* [Glitch] Add role badges to WebUI
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Ensure role name remains readable
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-26 23:35:23 +01:00
neatchee
20abef6590
Allow users to set the trigger height for lengthy toot auto-collapse ( #2070 )
...
* Allow users to set the trigger height for lengthy toot autocollapse
Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered
Originally authored by Dean Bassett (github.com/deanveloper)
Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18
* Remove bad escape characters
* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity
* Update comments re: lengthy toot height
* Fix inconsistent indentation
* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
Jeremy Kescher
855b0d4dbb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2023-01-26 17:27:01 +01:00
Claire
2093436349
[Glitch] Fix styling of featured tags in light theme
...
Port e5ae75bf6a
2023-01-25 17:27:23 +01:00
Claire
cf3ad10e75
[Glitch] Fix upload area display in single-column mode
...
Port 54e798a5a0
2023-01-24 20:36:59 +01:00
Jeremy Kescher
bd30ddd982
Merge remote-tracking branch 'upstream/main' into develop
2023-01-22 11:33:25 +01:00
Eugen Rochko
a4090ab646
[Glitch] Fix wrong text color on some buttons in light theme in web UI
...
Port 13e9d91ba7
2023-01-21 15:08:51 +01:00
Eugen Rochko
0d20b38da7
[Glitch] Fix wrong padding in RTL layout in web UI
...
Port part of 4894deca7e
2023-01-21 15:07:52 +01:00
Jeremy Kescher
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/features/ui/index.js
# app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
Claire
26c2b401a5
Fix missing admin CSS in glitch-soc flavor ( #2088 )
...
Port SCSS changes from 43f56f1291
2023-01-18 18:54:04 +01:00
Claire
9b4afb320a
[Glitch] Change account moderation notes to make links clickable
...
Port 9b3e22c40d
2023-01-18 17:49:29 +01:00
Peter Simonsson
9205b4e32f
[Glitch] Add checkmark symbol to checkbox
...
Port 7e6ffa085f
2023-01-18 17:48:48 +01:00
Jeremy Kescher
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Claire
598888a7c4
[Glitch] Remove hardcoded width from dropdown overlays
...
Port f4a6365f55
2023-01-12 17:48:10 +01:00
Peter Simonsson
a36dfbb2aa
[Glitch] Fix dropdown menu positions when scrolling
...
Port fd33bcb3b2
2023-01-12 11:18:22 +01:00
Jeremy Kescher
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/components/status_action_bar.js
# app/javascript/flavours/glitch/containers/status_container.js
# app/javascript/flavours/glitch/features/status/components/action_bar.js
# app/javascript/flavours/glitch/locales/de.json
# app/javascript/flavours/glitch/locales/fr.json
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/status/components/action_bar.js
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
2023-01-05 23:29:53 +01:00
Jed Fox
1702907a9d
[Glitch] Improve the contrast of the chart in “poll has ended” notifications
...
Port b81b646e3b
2023-01-05 15:11:23 +01:00
Darius Kazemi
476c131946
[Glitch] Replace flex styling with sensible layout rules
...
Port ef4d29c879
2023-01-02 17:32:29 +01:00
Plastikmensch
08837f730d
Use wrapper div as a spacer ( #2046 )
...
Keeps the alignment of timestamps, while also reducing clickable size
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 18:59:20 +01:00
