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

hc bRanD reFrEsH #94

Merged
merged 2 commits into from
Nov 15, 2020
Merged

hc bRanD reFrEsH #94

merged 2 commits into from
Nov 15, 2020

Conversation

jackyzha0
Copy link
Contributor

  • made some colours more consistent
  • hc theme yeet

Screen Shot 2020-11-14 at 4 06 38 PM

@jackyzha0 jackyzha0 added the 1pt label Nov 15, 2020
@jackyzha0 jackyzha0 requested a review from ianmah November 15, 2020 00:08
@github-actions
Copy link

github-actions bot commented Nov 15, 2020

Visit the preview URL for this PR (updated for commit 7214026):

https://nwplus-ubc--pr94-hc-brand-refresh-vwubfyq4.web.app

(expires Sun, 22 Nov 2020 03:25:20 GMT)

🔥 via Firebase Hosting GitHub Action 🌎


${p =>
p.theme.custom_imgs === 'hc' &&
css`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HC logo is more rectangle than square, so just fixing width and padding to make it look nicer

Copy link
Contributor

@ianmah ianmah Nov 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't do that without the css import?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how else should i do the conditional css bit?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this not work

  ${p =>
    p.theme.custom_imgs === 'hc' &&
    `
      width: 120px;
      margin: 30px 0 0px 60px;
    `}
`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lemme try that

@jackyzha0 jackyzha0 requested a review from ianmah November 15, 2020 03:24

${p =>
p.theme.custom_imgs === 'hc' &&
css`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same thing here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file already imports css so i think it should be fine lol

@jackyzha0 jackyzha0 merged commit 42ec0d9 into master Nov 15, 2020
@jackyzha0 jackyzha0 deleted the hc-brand-refresh branch November 15, 2020 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants