Skip to content

Commit

Permalink
chore(myanimelist): fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@orangci
orangci committed Nov 26, 2024
1 parent 7d04555 commit d071fcd
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 37 deletions.
106 changes: 88 additions & 18 deletions scripts/userstyles.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ collaborators:
- &winston
name: winston
url: https://github.com/nekowinston
- &gitmuslim
url: https://github.com/GitMuslim
- &tnixc
name: Tnixc
url: https://github.com/Tnixc
Expand Down Expand Up @@ -133,20 +131,29 @@ collaborators:
- &Flapperoo
name: Eli
url: https://github.com/Flapperoo
- &jh-devv
name: jh-devv
url: https://github.com/jh-devv
- &sofiedotcafe
name: Sofie
url: https://github.com/sofiedotcafe
- &stellophiliac
url: https://github.com/stellophiliac
- &neongamerbot
url: https://github.com/NeonGamerBot-QK
- &orxngc
- &orangci
name: orangc
url: https://github.com/orxngc
url: https://github.com/orangci
- &Lichthagel
url: https://github.com/Lichthagel
- &comfysage
url: https://github.com/comfysage
- &TadoTheMiner
name: jan Tatesa
url: https://github.com/TadoTheMiner
- &mxgic1337
url: https://github.com/mxgic1337
- &steinuil
url: https://github.com/steinuil
- &husjon
url: https://github.com/husjon

userstyles:
advent-of-code:
Expand Down Expand Up @@ -385,7 +392,7 @@ userstyles:
color: sapphire
readme:
app-link: "https://google.com"
current-maintainers: [*gitmuslim]
current-maintainers: []
google-drive:
name: Google Drive
categories: [productivity]
Expand All @@ -402,6 +409,13 @@ userstyles:
readme:
app-link: "https://photos.google.com"
current-maintainers: [*genshibe]
grabify:
name: Grabify
categories: [development, productivity]
color: teal
readme:
app-link: "https://grabify.link"
current-maintainers: [*trinkey]
graphite:
name: Graphite
categories: [development, productivity]
Expand Down Expand Up @@ -465,6 +479,14 @@ userstyles:
readme:
app-link: "https://github.com/benphelps/homepage"
current-maintainers: [*gandalf-the-blue]
hoogle:
name: Hoogle
categories: [development, productivity]
icon: haskell
color: mauve
readme:
app-link: "https://hoogle.haskell.org"
current-maintainers: [*jn-sena]
hoppscotch:
name: Hoppscotch
categories: [development, productivity]
Expand Down Expand Up @@ -502,6 +524,13 @@ userstyles:
readme:
app-link: "https://inoreader.com"
current-maintainers: [*thomas-philippot]
indie-wiki-buddy:
name: Indie Wiki Buddy
categories: [browser_extension]
color: blue
readme:
app-link: "https://getindie.wiki/"
current-maintainers: [*thismoon]
instagram:
name: Instagram
categories: [social_networking, photo_and_video, entertainment]
Expand Down Expand Up @@ -534,6 +563,13 @@ userstyles:
readme:
app-link: "https://jisho.org"
current-maintainers: [*Lichthagel]
keybr.com:
name: keybr.com
categories: [productivity]
color: text
readme:
app-link: "https://keybr.com"
current-maintainers: [*TadoTheMiner]
keyoxide:
name: Keyoxide
categories: [development]
Expand Down Expand Up @@ -599,6 +635,14 @@ userstyles:
readme:
app-link: 'https://listenbrainz.org'
current-maintainers: [*00dani]
lobste.rs:
name: Lobsters
categories: [discussion_forum, development, social_networking]
icon: lobsters
color: red
readme:
app-link: 'https://lobste.rs'
current-maintainers: [*steinuil]
mastodon:
name: Mastodon
categories: [social_networking, entertainment]
Expand Down Expand Up @@ -642,7 +686,7 @@ userstyles:
color: blue
readme:
app-link: "https://office.com"
current-maintainers: [*gitmuslim]
current-maintainers: []
migadu-webmail:
name: Migadu Webmail
categories: [email_client, productivity]
Expand All @@ -660,15 +704,15 @@ userstyles:
color: text
readme:
app-link: "https://minesweeper.online"
current-maintainers: [*gitmuslim]
current-maintainers: []
myanimelist:
name: MyAnimeList
categories: [entertainment, social_networking]
icon: myanimelist
color: sapphire
readme:
app-link: "https://myanimelist.net"
current-maintainers: [*orxngc]
current-maintainers: [*orangci]
namemc:
name: NameMC
categories: [game_development, analytics, discussion_forum]
Expand All @@ -685,6 +729,16 @@ userstyles:
readme:
app-link: "https://nitter.net"
current-maintainers: [*anubisnekhet]
nixos-manual:
name: ["NixOS Manual", "Nixpkgs Manual"]
categories: [development, wiki]
icon: nixos
color: blue
readme:
app-link:
- https://nixos.org/manual/nixos
- https://nixos.org/manual/nixpkgs
current-maintainers: [*husjon]
nixos-search:
name: NixOS Search
categories: [search_engine]
Expand All @@ -700,7 +754,7 @@ userstyles:
color: blue
readme:
app-link: "wiki.nixos.org"
current-maintainers: [*orxngc]
current-maintainers: [*orangci]
past-maintainers: [*winston]
npm:
name: npm
Expand Down Expand Up @@ -782,6 +836,14 @@ userstyles:
readme:
app-link: https://porkbun.com
current-maintainers: [*uncenter]
pronouns.cc:
name: pronouns.cc
categories: [social_networking]
color: mauve
readme:
app-link: "https://pronouns.cc/"
current-maintainers: [*comfysage]
past-maintainers: [*neongamerbot]
pronouns.page:
name: Pronouns.page
categories: [social_networking]
Expand All @@ -808,6 +870,14 @@ userstyles:
readme:
app-link: "https://pypi.org"
current-maintainers: [*trinkey]
pythonanywhere:
name: PythonAnywhere
categories: [development]
icon: pythonanywhere
color: sapphire
readme:
app-link: "https://pythonanywhere.com"
current-maintainers: [*trinkey]
quizlet:
name: Quizlet
categories: [education, productivity]
Expand Down Expand Up @@ -853,7 +923,7 @@ userstyles:
color: mauve
readme:
app-link: "https://shinigami-eyes.github.io"
current-maintainers: [*jh-devv]
current-maintainers: [*sofiedotcafe]
snapchat-web:
name: Snapchat Web
categories: [social_networking, photo_and_video, entertainment]
Expand Down Expand Up @@ -892,15 +962,15 @@ userstyles:
color: teal
readme:
app-link: "https://github.com/openstyles/stylus"
current-maintainers: [*gitmuslim]
current-maintainers: []
substack:
name: Substack
categories: [entertainment, social_networking]
icon: substack
color: peach
readme:
app-link: "https://substack.com"
current-maintainers: []
current-maintainers: [*uncenter]
past-maintainers: [*winston]
syncthing:
name: Syncthing
Expand Down Expand Up @@ -956,7 +1026,7 @@ userstyles:
color: mauve
readme:
app-link: "https://twitch.tv"
current-maintainers: [*gitmuslim, *uncenter]
current-maintainers: [*uncenter, *mxgic1337]
twitter:
name: Twitter
categories: [social_networking, discussion_forum, entertainment]
Expand Down Expand Up @@ -1008,7 +1078,7 @@ userstyles:
color: text
readme:
app-link: "https://www.wikipedia.org"
current-maintainers: [*gitmuslim]
current-maintainers: []
wikiwand:
name: Wikiwand
categories: [wiki, productivity]
Expand All @@ -1029,4 +1099,4 @@ userstyles:
answer: "It's available in case you have an OLED display. If you have one, you might want to enable this."
current-maintainers: [*isabelroses, *uncenter]
past-maintainers: [*elkrien]
# yaml-language-server: $schema=userstyles.schema.json
# yaml-language-server: $schema=userstyles.schema.json
35 changes: 16 additions & 19 deletions styles/myanimelist/catppuccin.user.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,17 @@
@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"]
==/UserStyle== */

@-moz-document domain('myanimelist.net') {
/* Exclude animelist and mangalist pages */
@-moz-document regexp("^(?!.*myanimelist\\.net\\/(animelist|mangalist)\\/).*$") {
@media (prefers-color-scheme: light) {
:root {
#catppuccin(@lightFlavor, @accentColor);
}
}
@media (prefers-color-scheme: dark) {
:root {
#catppuccin(@darkFlavor, @accentColor);
}
}
@-moz-document regexp("^(?!.*myanimelist\\.net\\/(animelist|mangalist)\\/).*$") {
@media (prefers-color-scheme: light) {
:root {
#catppuccin(@lightFlavor, @accentColor);
}
}
@media (prefers-color-scheme: dark) {
:root {
#catppuccin(@darkFlavor, @accentColor);
}
}

#catppuccin(@lookup, @accent) {
@rosewater: @catppuccin[@@lookup][@rosewater];
Expand Down Expand Up @@ -90,10 +87,10 @@

/* prettier-ignore */
@catppuccin: {
@latte: { @rosewater: #dc8a78; @flamingo: #dd7878; @pink: #ea76cb; @mauve: #8839ef; @red: #d20f39; @maroon: #e64553; @peach: #fe640b; @yellow: #df8e1d; @green: #40a02b; @teal: #179299; @sky: #04a5e5; @sapphire: #209fb5; @blue: #1e66f5; @lavender: #7287fd; @text: #4c4f69; @subtext1: #5c5f77; @subtext0: #6c6f85; @overlay2: #7c7f93; @overlay1: #8c8fa1; @overlay0: #9ca0b0; @surface2: #acb0be; @surface1: #bcc0cc; @surface0: #ccd0da; @base: #eff1f5; @mantle: #e6e9ef; @crust: #dce0e8; };
@frappe: { @rosewater: #f2d5cf; @flamingo: #eebebe; @pink: #f4b8e4; @mauve: #ca9ee6; @red: #e78284; @maroon: #ea999c; @peach: #ef9f76; @yellow: #e5c890; @green: #a6d189; @teal: #81c8be; @sky: #99d1db; @sapphire: #85c1dc; @blue: #8caaee; @lavender: #babbf1; @text: #c6d0f5; @subtext1: #b5bfe2; @subtext0: #a5adce; @overlay2: #949cbb; @overlay1: #838ba7; @overlay0: #737994; @surface2: #626880; @surface1: #51576d; @surface0: #414559; @base: #303446; @mantle: #292c3c; @crust: #232634; };
@macchiato: { @rosewater: #f4dbd6; @flamingo: #f0c6c6; @pink: #f5bde6; @mauve: #c6a0f6; @red: #ed8796; @maroon: #ee99a0; @peach: #f5a97f; @yellow: #eed49f; @green: #a6da95; @teal: #8bd5ca; @sky: #91d7e3; @sapphire: #7dc4e4; @blue: #8aadf4; @lavender: #b7bdf8; @text: #cad3f5; @subtext1: #b8c0e0; @subtext0: #a5adcb; @overlay2: #939ab7; @overlay1: #8087a2; @overlay0: #6e738d; @surface2: #5b6078; @surface1: #494d64; @surface0: #363a4f; @base: #24273a; @mantle: #1e2030; @crust: #181926; };
@mocha: { @rosewater: #f5e0dc; @flamingo: #f2cdcd; @pink: #f5c2e7; @mauve: #cba6f7; @red: #f38ba8; @maroon: #eba0ac; @peach: #fab387; @yellow: #f9e2af; @green: #a6e3a1; @teal: #94e2d5; @sky: #89dceb; @sapphire: #74c7ec; @blue: #89b4fa; @lavender: #b4befe; @text: #cdd6f4; @subtext1: #bac2de; @subtext0: #a6adc8; @overlay2: #9399b2; @overlay1: #7f849c; @overlay0: #6c7086; @surface2: #585b70; @surface1: #45475a; @surface0: #313244; @base: #1e1e2e; @mantle: #181825; @crust: #11111b; };
}
@latte: { @rosewater: #dc8a78; @flamingo: #dd7878; @pink: #ea76cb; @mauve: #8839ef; @red: #d20f39; @maroon: #e64553; @peach: #fe640b; @yellow: #df8e1d; @green: #40a02b; @teal: #179299; @sky: #04a5e5; @sapphire: #209fb5; @blue: #1e66f5; @lavender: #7287fd; @text: #4c4f69; @subtext1: #5c5f77; @subtext0: #6c6f85; @overlay2: #7c7f93; @overlay1: #8c8fa1; @overlay0: #9ca0b0; @surface2: #acb0be; @surface1: #bcc0cc; @surface0: #ccd0da; @base: #eff1f5; @mantle: #e6e9ef; @crust: #dce0e8; };
@frappe: { @rosewater: #f2d5cf; @flamingo: #eebebe; @pink: #f4b8e4; @mauve: #ca9ee6; @red: #e78284; @maroon: #ea999c; @peach: #ef9f76; @yellow: #e5c890; @green: #a6d189; @teal: #81c8be; @sky: #99d1db; @sapphire: #85c1dc; @blue: #8caaee; @lavender: #babbf1; @text: #c6d0f5; @subtext1: #b5bfe2; @subtext0: #a5adce; @overlay2: #949cbb; @overlay1: #838ba7; @overlay0: #737994; @surface2: #626880; @surface1: #51576d; @surface0: #414559; @base: #303446; @mantle: #292c3c; @crust: #232634; };
@macchiato: { @rosewater: #f4dbd6; @flamingo: #f0c6c6; @pink: #f5bde6; @mauve: #c6a0f6; @red: #ed8796; @maroon: #ee99a0; @peach: #f5a97f; @yellow: #eed49f; @green: #a6da95; @teal: #8bd5ca; @sky: #91d7e3; @sapphire: #7dc4e4; @blue: #8aadf4; @lavender: #b7bdf8; @text: #cad3f5; @subtext1: #b8c0e0; @subtext0: #a5adcb; @overlay2: #939ab7; @overlay1: #8087a2; @overlay0: #6e738d; @surface2: #5b6078; @surface1: #494d64; @surface0: #363a4f; @base: #24273a; @mantle: #1e2030; @crust: #181926; };
@mocha: { @rosewater: #f5e0dc; @flamingo: #f2cdcd; @pink: #f5c2e7; @mauve: #cba6f7; @red: #f38ba8; @maroon: #eba0ac; @peach: #fab387; @yellow: #f9e2af; @green: #a6e3a1; @teal: #94e2d5; @sky: #89dceb; @sapphire: #74c7ec; @blue: #89b4fa; @lavender: #b4befe; @text: #cdd6f4; @subtext1: #bac2de; @subtext0: #a6adc8; @overlay2: #9399b2; @overlay1: #7f849c; @overlay0: #6c7086; @surface2: #585b70; @surface1: #45475a; @surface0: #313244; @base: #1e1e2e; @mantle: #181825; @crust: #11111b; };
}

// vim:ft=less
// vim:ft=less

0 comments on commit d071fcd

Please sign in to comment.