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

Updated wave icons for contrast, updated graphics for greater legibility #2821

Merged
merged 4 commits into from
Jul 8, 2016

Conversation

RebeccaDeField
Copy link
Contributor

@RebeccaDeField RebeccaDeField commented Jun 4, 2016

I made some updates to the graphs to improve the hinting and to match the updated LFO and Envelope backgrounds. I also updated the waveform icons to have more contrast with all of the plugins.

Fixes this problem here.
Referenced here.

@BaraMGB @Umcaruje @tresf

@RebeccaDeField RebeccaDeField changed the title Updated wave icons for contrast, updated graphcs for more legibility Updated wave icons for contrast, updated graphcs for greater legibility Jun 4, 2016
@RebeccaDeField RebeccaDeField mentioned this pull request Jun 10, 2016
14 tasks
@BaraMGB
Copy link
Contributor

BaraMGB commented Jun 10, 2016

The lfo controller artwork I have added yet here #2816. Sorry, I forgot to change the title of the PR. There two commits in there. One for the peak controller and one for the lfo controller.

@RebeccaDeField
Copy link
Contributor Author

@BaraMGB Not sure how I missed that, sorry! Do you know how to remove a commit from a pull request? I will also look into it.

@RebeccaDeField RebeccaDeField changed the title Updated wave icons for contrast, updated graphcs for greater legibility Updated wave icons for contrast, updated graphics for greater legibility Jun 11, 2016
@Umcaruje
Copy link
Member

@RebeccaDeField this looks better:
screenshot from 2016-06-05 22 03 41

But could you please increase the backround size so there's a 1 pixel padding between the icons and the BG? I think that'd make it better.

@RebeccaDeField
Copy link
Contributor Author

RebeccaDeField commented Jun 13, 2016

usr_wave_active
round_square_wave_active
exp_wave_active
saw_wave_active

@Umcaruje Updated. Does this look better to you?

@Umcaruje
Copy link
Member

@Umcaruje Updated. Does this look better to you?

Yes that looks very good 👍

@RebeccaDeField
Copy link
Contributor Author

@Umcaruje Before I make another commit with the updated waveforms, I need to address the problem that the LFO artwork is a duplicate from @BaraMGB's pull request that was already merged. It seems there are very many ways to handle this on git, but I'm not sure what the best way is to go about it.

@teeberg
Copy link
Contributor

teeberg commented Jun 15, 2016

If the files are identical, the merge shouldn't be a problem. Otherwise, look at the two conflicting images and git add the right ones to resolve the conflict for each file individually. Happy to assist in gitter if you need any more pointers!

@RebeccaDeField
Copy link
Contributor Author

@teeberg The files are identical, so it should be fine?

@teeberg
Copy link
Contributor

teeberg commented Jun 15, 2016

Have you already pushed all the files here? According to github, there are no merge conflicts :)
image

@RebeccaDeField
Copy link
Contributor Author

@teeberg I need to make one last commit and then it should be all set to go.

@RebeccaDeField
Copy link
Contributor Author

RebeccaDeField commented Jun 15, 2016

@teeberg @Umcaruje updated and all checks passed. I think this is ready to be merged.

@Umcaruje
Copy link
Member

Umcaruje commented Jul 8, 2016

I think this is ready to be merged.

👍

@Umcaruje Umcaruje merged commit ddf587c into LMMS:master Jul 8, 2016
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
…ity (LMMS#2821)

* Updated wave icons for more contrast, updated graphcs for more legibility

* Added LFO artwork

* Updated waveform graphics
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.

4 participants