-
-
Notifications
You must be signed in to change notification settings - Fork 7
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
mashaal
wants to merge
36
commits into
merveilles:merveilles
Choose a base branch
from
mashaal:merveilles
base: merveilles
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Rebase conflict with icons, updated with Merveilles ones x2 on 4.0.2
- Rebase conflict 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
CSS Style Tweaks
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.
* 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
SomniusTiger
force-pushed
the
merveilles
branch
from
December 26, 2023 21:28
338b2f6
to
fdf39e7
Compare
SomniusTiger
force-pushed
the
merveilles
branch
from
February 2, 2024 09:02
fdf39e7
to
96f7c36
Compare
SomniusTiger
force-pushed
the
merveilles
branch
from
February 21, 2024 21:35
5d05acd
to
a67c99d
Compare
SomniusTiger
force-pushed
the
merveilles
branch
from
September 10, 2024 00:56
a67c99d
to
b93c9a2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The colour of verified profile links is using the default Mastodon green, which is slightly off from the Merveilles cyan.