Skip to content

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

Merged
Umcaruje merged 4 commits into
LMMS:stable-1.2from
PhysSong:stable-1.2
Jul 3, 2017
Merged

Umcaruje merged 4 commits into
LMMS:stable-1.2from
PhysSong:stable-1.2

Conversation

@PhysSong

@PhysSong PhysSong commented Jun 25, 2017

Copy link
Copy Markdown
Member

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

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

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

@tresf

tresf commented Jul 2, 2017

Copy link
Copy Markdown
Member

@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

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

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

@Umcaruje

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

I'll look into this today

@Umcaruje

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

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.

@PhysSong

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

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

@Umcaruje

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

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

Comment thread data/themes/classic/style.css Outdated
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,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

@tresf

tresf commented Jul 2, 2017

Copy link
Copy Markdown
Member

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

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

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

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

@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

tresf commented Jul 2, 2017

Copy link
Copy Markdown
Member

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

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

@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

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

@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

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

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

@Umcaruje

Umcaruje commented Jul 2, 2017

Copy link
Copy Markdown
Member

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

tresf commented Jul 2, 2017

Copy link
Copy Markdown
Member

Would the commits be squashed on merge?

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

@PhysSong

PhysSong commented Jul 2, 2017

Copy link
Copy Markdown
Member Author

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

@PhysSong

PhysSong commented Jul 3, 2017

Copy link
Copy Markdown
Member Author

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

@zonkmachine

Copy link
Copy Markdown
Contributor

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

I restarted the failing build. ✅

@PhysSong

PhysSong commented Jul 3, 2017

Copy link
Copy Markdown
Member Author

@Umcaruje Now fixed.

@Umcaruje

Umcaruje commented Jul 3, 2017

Copy link
Copy Markdown
Member

@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
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
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
…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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Text missing on the envelope tabs with Classic theme.

4 participants