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

Flat background instead of gradient #2886

Merged
merged 3 commits into from
Oct 16, 2017
Merged

Flat background instead of gradient #2886

merged 3 commits into from
Oct 16, 2017

Conversation

bia
Copy link
Contributor

@bia bia commented Oct 11, 2017

As decided in last week's design sync.
@fbarl was there another reason why the overlay-wrapper would need a background colour? I remember talking about it...

@bia bia requested a review from fbarl October 11, 2017 13:08
Copy link
Contributor

@fbarl fbarl left a comment

Choose a reason for hiding this comment

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

Good stuff!

Please just remove the first commit Merge branch 'master' into background-colors before merging (we normally do git fetch && git rebase origin/master in the working branch when we want to pull the latest changes from master) and check out my comment about overlay wrapper transparency.

@@ -58,5 +58,5 @@ $search-border-width: 1px;
$timeline-height: 55px;

/* specific elements */
$body-background-color: linear-gradient(30deg, $background-color 0%, $background-lighter-color 100%);
$body-background-color: $background-average-color;

This comment was marked as abuse.

This comment was marked as abuse.

@@ -102,7 +102,7 @@ a {

.overlay-wrapper {
align-items: center;
background-color: fade-out($background-average-color, 0.1);
background-color: transparent;

This comment was marked as abuse.

@bia
Copy link
Contributor Author

bia commented Oct 12, 2017

Thanks for the comments! The overlay background colour makes sense and I reverted the transparent colour change.

How do I remove Merge branch 'master' into background-colors?
Roli suggested that I make a one-time git config --global pull.rebase true for the future.

@fbarl
Copy link
Contributor

fbarl commented Oct 16, 2017

How do I remove Merge branch 'master' into background-colors?
Roli suggested that I make a one-time git config --global pull.rebase true for the future.

I'm not sure how @rndstr's command works, but git rebase is definitely your friend here and by running it in interactive mode you can manipulate (and delete) individual commits from your PR (e.g. try git rebase -i HEAD~3 in this branch).

If you don't manage to fix your git tree for this PR, maybe you could just reset your branch at master and apply that one line change in a new clean commit (normally I wouldn't recommend that but this PR is really just a one-liner).

Hope that helps! :)

@bia
Copy link
Contributor Author

bia commented Oct 16, 2017

Thanks @fbarl ! That's fixed now.

@bia bia closed this Oct 16, 2017
@bia bia reopened this Oct 16, 2017
@bia bia merged commit 6098f87 into master Oct 16, 2017
@rndstr
Copy link
Contributor

rndstr commented Oct 16, 2017

I'm not sure how @rndstr's command works

That appends --rebase to any git pull automatically so it doesn't merge in remote commits.

@dlespiau dlespiau deleted the background-colors branch November 2, 2017 12:28
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.

3 participants