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

swap out old logo for T&C logo in Qt GUI #2081

Merged
merged 9 commits into from
May 29, 2018
Merged

Conversation

nmarley
Copy link

@nmarley nmarley commented May 24, 2018

Note that this isn't a full re-design, but a simple logo swap. Special thanks to @dashchris for working on these images.

The first commit re-names the original "light" theme to "light-retro", the 2nd commit adds a new "light" theme with the new logo images.

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

See inline comments + toolbar.png and toolbar_testnet.png should be updated too.

@@ -70,7 +70,7 @@ background-color:#F8F6F6;
/*******************************************************/

QLabel { /* Base Text Size & Color */
font-size:12px;
font-size:9pt;
Copy link

Choose a reason for hiding this comment

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

Should not touch this file, pls revert all changes made below.

@@ -1,5 +1,5 @@
WalletFrame {
border-image: url(':/images/light/drkblue_walletFrame_bg') 0 0 0 0 stretch stretch;
border-image: url(':/images/light-retro/drkblue_walletFrame_bg') 0 0 0 0 stretch stretch;
Copy link

@UdjinM6 UdjinM6 May 24, 2018

Choose a reason for hiding this comment

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

Should not update this file, should copy light-hires theme to light-hires-retro and update it with -retro suffixes instead. Pls revert all changes made below.

Copy link
Author

Choose a reason for hiding this comment

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

@UdjinM6 Previous to this PR, the light-hires.css file actually makes reference to light theme. Since we re-named light to light-retro, I believe the references in light-hires.css should be updated to refer to the new name, right?

In that case I believe this should stand. Otherwise light-hires.css is referencing the new, updated images.

Copy link

@UdjinM6 UdjinM6 May 25, 2018

Choose a reason for hiding this comment

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

Hmm, no... Let me explain how I see it should be done, step by step:

  1. light-hires should be copied to light-hires-retro;
  2. light-hires-retro should have all links updated from light to light-retro, should have no other code changes;
  3. light-hires should have all images updated to ones with the new logo, should have no code changes at all.

@nmarley
Copy link
Author

nmarley commented May 24, 2018

See inline comments + toolbar.png and toolbar_testnet.png should be updated too.

Will do, but wanted to note that those 2 image files aren't referenced or used anywhere I could see and planned to drop them in a later PR.

@UdjinM6
Copy link

UdjinM6 commented May 24, 2018

re toolbar.png: Heh, good catch 👍

@UdjinM6 UdjinM6 added this to the 12.3 milestone May 28, 2018
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

Looks good now 👍

ACK

@UdjinM6 UdjinM6 merged commit 82805a6 into dashpay:develop May 29, 2018
@nmarley nmarley deleted the qt-branding branch July 1, 2018 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants