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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:43:24 +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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
cf3ad10e75
[Glitch] Fix upload area display in single-column mode
...
Port 54e798a5a0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:36:59 +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
Peter Simonsson
9205b4e32f
[Glitch] Add checkmark symbol to checkbox
...
Port 7e6ffa085f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12 17:48:10 +01:00
Peter Simonsson
a36dfbb2aa
[Glitch] Fix dropdown menu positions when scrolling
...
Port fd33bcb3b2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
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
Plastikmensch
4b51d1386b
Realign timestamps ( #2044 )
...
Add missing display and overflow properties.
Fixes misaligned timestamps and missing overflow in search.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 12:35:03 +01:00
prplecake
6cde3dd08b
Wraps status timestamps in a div
( #2038 )
...
* Wraps status timestamps in a `div`
Fixes #1985
This wraps the status timestamp in a `div` to reduce the clickable
target size of the link. The `div` gets a `margin: 0 0 0 auto` to stick
it to the right margin of the status.
* Update app/javascript/flavours/glitch/styles/components/status.scss
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-12-22 15:18:02 +01:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Claire
0912fb736d
[Glitch] Add follow request banner on account header
...
Port 70415714f1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:11:32 +01:00
Mina Her
0f5ecb3860
[Glitch] Fix margin for search field on medium window size
...
Port cedf138313
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:03:14 +01:00
Claire
602f18103c
[Glitch] Fix the top action bar appearing in multi-column layout
...
Port 38596e49d4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:59:59 +01:00
Connor Shea
e76fb9b2c4
[Glitch] Increase the width of the unread notification border.
...
Port 08c0e43b6f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:22 +01:00
Riedler
8cd7b95559
[Glitch] Fix profile avatar being slightly offset into left border
...
Port c3388f4ab1
to glitch-soc
Co-authored-by: Riedler <riedler@gelse.eu>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:49:15 +01:00
cadars
32b8b3355b
[Glitch] Make handle more easily selectable on profile page
...
Port 52a50c5e43
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:19:23 +01:00
fef
bdd3c4691d
fix padding on posts without reactions
...
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added. Adding display: none to
empty reaction bars restores this exact look.
2022-12-09 23:08:42 +01:00
fef
fd885bec48
fix reaction margins and paddings
2022-12-09 23:04:13 +01:00
fef
266bf2543d
fix padding for reaction button
2022-12-09 23:04:12 +01:00
Juan Xavier Gomez
16fb604c52
[Glitch] Fix hidden overflow on interaction modal
...
Port 21b208afcb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:11:57 +01:00
Claire
4642f7d830
[Glitch] Fix UI header overflow on mobile
...
Port 76454cc638
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:10:47 +01:00
Claire
4ac6601476
Port navigation bar from upstream ( #1986 )
...
Fixes #1977
2022-12-01 20:06:08 +01:00
Eugen Rochko
f7684a31fe
[Glitch] Change design of translations in web UI
...
Port fcca781aae
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Connor Shea
f51990bd62
[Glitch] Make the 'Trending now' header a link to Explore.
...
Port cec1e902e0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:59:00 +01:00
Claire
6517b7b9f0
Fix pillbar buttons in light theme ( #1972 )
...
* Simplify pillbar button design and make it more consistent with toggles
* Fix pillbar buttons in light theme
Fixes #1970
2022-11-25 13:54:43 +01:00
Eugen Rochko
9db90d2ebe
[Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI
...
Port 6da9df774e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 09:16:41 +01:00
Eugen Rochko
400d168310
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 6774c339b2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:56:49 +01:00
Eugen Rochko
65b6c4f6df
[Glitch] Change larger reblogs/favourites numbers to be shortened in web UI
...
Port 7bdb2433f1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 10:15:21 +01:00
Claire
c493c967d6
Fix light theme issues with the favourite modal and some background colors ( #1902 )
...
* Fix favourite modal styling in glitch-soc light theme
* Fix unnecessary difference between glitch-soc's light theme and upstream's
2022-11-07 10:34:18 +01:00
Sunny Ripert
7ba13dddfa
[Glitch] Fix double button to clear emoji search input
...
Port 4b7f32a2a6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:55:44 +01:00
Claire
0be6da42d3
Change glitch-soc composer classes to match upstream
2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em ( #1879 )
2022-11-01 09:41:58 +01:00
Eugen Rochko
9f6c175550
[Glitch] Fix number of uses being shown again on trending hashtags in web UI
...
Port 923f06a07c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Robert Laurenz
047a2f1f1b
[Glitch] fix(component): adjust style of counter button to fix overflow issue
...
Port 10922294ff
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Eugen Rochko
80b53623e1
[Glitch] Change settings area to be separated into categories in admin UI
...
Port 7c152acb2c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00