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

Update classic/style.css with TabWidget, TrackView, PianoView and Fader colors #3665

Merged
merged 4 commits into from Jul 3, 2017

Conversation

@PhysSong
Copy link
Member

@PhysSong PhysSong commented Jun 25, 2017

It fixes #3652 by adding TabWidget color settings to classic/style.css.
@Umcaruje @RebeccaLaVie If you don't like this color, please change it.

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@Umcaruje Now you can push commits on my fork. Please change colors appropriately.

@tresf
Copy link
Member

@tresf tresf commented Jul 2, 2017

@Umcaruje @RebeccaLaVie If you don't like this color, please change it.

@PhysSong Can you please provide a preview of this PR? That would make the decision a bit quicker.

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@tresf I can't provide preview right now. Currently colors are the same as default theme.

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

I'll look into this today

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

I updated the colors:
image

I also ran a diff between the two themes, and updated some other changes in the classic theme that we missed, so the files now should have the identical rules, just different colors.

@Umcaruje Umcaruje force-pushed the PhysSong:stable-1.2 branch from 8e91f11 to da8936b Jul 2, 2017
@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@Umcaruje Great job! Thanks a lot.
Is it ready for merge?

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

I'll leave this open for 12 hours if anyone wants to chime in, I'll merge afterwards.

@@ -24,8 +24,8 @@ AutomationEditor {

qproperty-graphColor: rgba(153, 175, 255, 200);
qproperty-scaleColor: qlineargradient(spread:reflect,
x1:0, y1:0.5, x2:1, y2:0.5,
stop:0 #333, stop:1 #202020);
x1:0, y1:0.5, x2:1, y2:0.5,

This comment has been minimized.

@tresf

tresf Jul 2, 2017
Member

These lines don't appear to have been changed and the formatting is inconsistent.

@tresf
Copy link
Member

@tresf tresf commented Jul 2, 2017

I see a lot of unnecessary formatting changes. Can we just change the lines that are needed for the PR? data/themes/default/style.css shouldn't even be in this PR. The more lines we touch, the harder it is to rebase onto master.

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

The thing is that I tried to make the formatting consistent throughout the file, cause it was all over the place, and using spaces instead of tabs. I am not aware of any theme changes on master, so I don't think rebasing this would be a problem.

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@tresf Yes. default/style.css shouldn't in this PR.
We need only fix difference between two css file. Formatting is what @Umcaruje should do after this PR is merged.

@tresf
Copy link
Member

@tresf tresf commented Jul 2, 2017

Formatting is what @Umcaruje should do after this PR is merged.

Formatting should be targeted at master, really and we have an initiative to do formatting cleanup anyway. Stable branches are not actively developed, so making the source more readable serves no purpose.

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@tresf @Umcaruje If there's no objection, I'll revert last three commits and andd a commit to remove unnecessary formatting change.
I will also provide diff file between re-formatted css and one without formatting change. @Umcaruje You will be able to use the diff for further formatting.

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

@tresf @Umcaruje If there's no objection, I'll revert last three commits and andd a commit to remove unnecessary formatting change.
I will also provide diff file between re-formatted css and one without formatting change. @Umcaruje You will be able to use the diff for further formatting.

Or I can just re-commit the 5 lines I changed tommorow, you two make good points and I'll fix this :)

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

@Umcaruje I can do it soon. Would the commits be squashed on merge?
@tresf Thanks for your feedback!

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 2, 2017

Would the commits be squashed on merge?

Yeah, thanks for working on this. Don't forget the changes in Fader and the track background and the piano widget :)

@tresf
Copy link
Member

@tresf tresf commented Jul 2, 2017

Would the commits be squashed on merge?

Yes, that is our default option, so they'd be squashed unless asked otherwise.

@PhysSong PhysSong force-pushed the PhysSong:stable-1.2 branch from da8936b to eaf4cf0 Jul 2, 2017
@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 2, 2017

I reverted formatting changes. I also attached the diff for further formatting.

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 3, 2017

Travis CI is failing, but it isn't a problem obviously.
See this.

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Jul 3, 2017

Travis CI is failing, but it isn't a problem obviously.

I restarted the failing build.

@Umcaruje

This comment has been minimized.

Copy link
Member

@Umcaruje Umcaruje commented on data/themes/classic/style.css in eaf4cf0 Jul 3, 2017

Yeah, this should've stayed, not a formatting change

@PhysSong
Copy link
Member Author

@PhysSong PhysSong commented Jul 3, 2017

@Umcaruje Now fixed.

@Umcaruje
Copy link
Member

@Umcaruje Umcaruje commented Jul 3, 2017

@PhysSong thank you very much for your work on this, this is ready to merge 👍

@Umcaruje Umcaruje changed the title Add TabWidget color settings to classic/style.css Update classic/style.css with TabWidget, TrackView, PianoView and Fader colors Jul 3, 2017
@Umcaruje Umcaruje merged commit 494714b into LMMS:stable-1.2 Jul 3, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
PhysSong added a commit to PhysSong/lmms that referenced this pull request Jul 8, 2017
…er colors (LMMS#3665)

* Add TabWidget color settings to classic/style.css

* update the classic theme

* Revert unnecessary formattings

* Fix style.css
PhysSong added a commit to PhysSong/lmms that referenced this pull request Jul 8, 2017
…er colors (LMMS#3665)

* Add TabWidget color settings to classic/style.css

* update the classic theme

* Revert unnecessary formattings

* Fix style.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.