Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correct cyan color on verified links #555

Open
wants to merge 36 commits into
base: merveilles
Choose a base branch
from

Conversation

mashaal
Copy link

@mashaal mashaal commented Nov 21, 2023

The colour of verified profile links is using the default Mastodon green, which is slightly off from the Merveilles cyan.

SomniusTiger and others added 30 commits July 7, 2023 23:11
- Rebase conflict with icons, updated with Merveilles ones x2 on 4.0.2
- Rebase conflict on 4.0.2
- Rebase conflict with hometown: custom styles, kept in Merveilles styles
Both the played and unplayed parts of the audio wave had the same color, this should fix it. For some strange reason I can't preview this in my developer tools so I hope this won't need more tinkering.
- Rebase conflict with hometown: keeps in Merveilles as default styles
…justments

Uses proper image file for Maru, updates en.yml with merveilles theme
- Rebase conflict with hometown: keeps dot from Merveilles as default avatar
set merveilles colorscheme for new visibility icon
This removes the explicit width for icon buttons, which was cutting off
part of the SVG background, and fixes the hover states by moving the
:hover rule to the parent element's selector.
- Rebase conflict: adds sponsor.joinmastodon.org link
I'd forgotten over the last couple of years that Mastodon has a way to mark all notifications as read.

https://merveilles.town/@akkartik/108080475076325407

This commit follows the other themes and switches settings buttons on column headers to be lighter than the background rather than darker.
drisc and others added 6 commits July 7, 2023 23:11
* Updated theme for oauth, kbd shortcuts page, profile dir and user joindate

* Themed the media upload graphic

* Fixed background on DM E2E warning header

* Themed user note section
* Updates with Merveilles branding

* Switches Merveilles icons

* Brightens mailer icon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants