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 discord transparency and add classes to target svg fills for themes #4747

Merged
merged 1 commit into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/assets/images/discord-logo-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion src/react-components/home/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ export function HomePage() {
<SignInButton mobile />
)}
<div className={styles.logoContainer}>
{isHmc ? <HmcLogo /> : <img alt={configs.translation("app-name")} src={configs.image("logo")} />}
{isHmc ? (
<HmcLogo className="hmc-logo" />
) : (
<img alt={configs.translation("app-name")} src={configs.image("logo")} />
)}
</div>
<div className={styles.appInfo}>
<div className={styles.appDescription}>{configs.translation("app-description")}</div>
Expand Down
7 changes: 4 additions & 3 deletions src/react-components/icons/SocialDiscord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/react-components/layout/Header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ header {
svg {
margin-left: 21px;
cursor: pointer;
*[fill]{
fill: theme.$text1-color;
}
}
li:first-child {
padding-top: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/react-components/layout/LoadingScreenLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function LoadingScreenLayout({ center, bottom, logoSrc }) {
return (
<div className={styles.loadingScreenLayout}>
<Column center padding gap="lg" className={styles.center}>
{isHmc ? <HmcLogo /> : <img className={styles.logo} src={logoSrc} />}
{isHmc ? <HmcLogo className="hmc-logo" /> : <img className={styles.logo} src={logoSrc} />}
{center}
</Column>
{bottom && (
Expand Down
4 changes: 3 additions & 1 deletion src/react-components/room/RoomEntryModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export function RoomEntryModal({
<Column center className={styles.content}>
{breakpoint !== "sm" &&
breakpoint !== "md" && (
<div className={styles.logoContainer}>{isHmc ? <HmcLogo /> : <img src={logoSrc} alt={appName} />}</div>
<div className={styles.logoContainer}>
{isHmc ? <HmcLogo className="hmc-logo" /> : <img src={logoSrc} alt={appName} />}
</div>
)}
<div className={styles.roomName}>
<h5>
Expand Down
2 changes: 1 addition & 1 deletion src/react-components/scene-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class SceneUI extends Component {
<div className={styles.mainPanel}>
<a href="/" className={styles.logo}>
{isHmc ? (
<HmcLogo />
<HmcLogo className="hmc-logo" />
) : (
<img
src={configs.image("logo")}
Expand Down
6 changes: 6 additions & 0 deletions src/react-components/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -463,3 +463,9 @@ input::placeholder {
summary {
cursor: pointer;
}

.hmc-logo {
[fill] {
fill: theme.$text1-color;
}
}