Closed Papa-Quill closed 4 months ago
Also, it may be easier if I merge #16 first—not sure if there's much overlap there or not.
We'll need to resolve conflicts before review. I see the font was removed but we should leave that and perhaps in the future we can document how the user can change it.
GitHub is still telling me there are conflicts—please try rebasing and that should do the trick
This is the conflict I'm seeing if that helps:
<<<<<<< main
.mainCard__0ec2c {
background-color: var(--background-secondary) !important;
}
.body-2wLx-E,
.headerTop-3GPUSF,
.bodyInnerWrapper-2bQs1k,
.footer-3naVBw,
.panels-3wFtMD {
background-color: var(--background-tertiary) !important;
}
.peopleColumn-1wMU14,
.panels-j1Uci_,
.peopleColumn-29fq28,
.peopleList-2VBrVI,
.content-2hZxGK,
.header-1zd7se,
.root-g14mjS .small-23Atuv .fullscreenOnMobile-ixj0e3 {
background-color: var(--background-secondary) !important;
}
.textArea-12jD-V,
.lookBlank-3eh9lL,
.threadSidebar-1o3BTy,
.scrollableContainer-2NUZem,
.perksModalContentWrapper-3RHugb,
.theme-dark .footer-31IekZ,
.theme-light .footer-31IekZ {
background-color: var(--background-tertiary) !important;
}
.numberBadge-2s8kKX,
.base-PmTxvP,
.baseShapeRound-1Mm1YW,
.bar-30k2ka,
.unreadMentionsBar-1Bu1dC,
.mention-1f5kbO,
.active-1SSsBb,
.disableButton-220a9y {
background-color: var(--ping) !important;
}
.lookOutlined-3sRXeN.colorRed-1TFJan {
color: var(--ping) !important;
}
.header-3OsQeK,
.container-ZMc96U {
box-shadow: none !important;
border: none !important;
}
.content-1gYQeQ,
.layout-1qmrhw,
.inputDefault-3FGxgL,
.input-2g-os5,
.input-2z42oC,
.role-2TIOKu,
.searchBar-jGtisZ {
border-radius: 6px !important;
}
.layout-1qmrhw:hover,
.content-1gYQeQ:hover {
background-color: var(--background-modifier-selected) !important;
}
=======
>>>>>>> main
Thank you ♥
Fix all the colors that haven't been maintained