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

Fix: paddings in website footer #161

Merged
merged 2 commits into from Jun 3, 2020
Merged

Fix: paddings in website footer #161

merged 2 commits into from Jun 3, 2020

Conversation

@James103
Copy link
Contributor

James103 commented Jun 2, 2020

See #117

They were originally lopsided, but now it's about equal on both sides.

Before:
image

After:
image

See #117
Copy link
Contributor

auge8472 left a comment

Please simplify the code with padding: 3px 5px;.

@LordAro
LordAro approved these changes Jun 2, 2020
@James103
Copy link
Contributor Author

James103 commented Jun 2, 2020

@LordAro approved these changes

@auge8472, can you please approve the changes as well so this PR can be merged?

@LordAro
Copy link
Member

LordAro commented Jun 2, 2020

It's been 5 minutes, don't be impatient

@auge8472
Copy link
Contributor

auge8472 commented Jun 3, 2020

Sorry for the delay. I had the first pub visit since months followed by the darkness of the night. :-)

[edit] Even someone else will merge this PR I need a clarification. I don't know, how to deploy the two commits. "Squash" or "rebase"? What's the way to go in such case? [/edit]

@LordAro LordAro merged commit 8855a64 into OpenTTD:master Jun 3, 2020
3 checks passed
3 checks passed
Docker build
Details
Flake8
Details
Black
Details
@LordAro
Copy link
Member

LordAro commented Jun 3, 2020

Squash, as the second commit is only "fixing" the previous. (If it were any more complicated we'd want to ask the author for a rebase to squash the 2 commits together, but we can do it manually here)

@James103 James103 deleted the James103:patch-1 branch Jun 8, 2020
@James103
Copy link
Contributor Author

James103 commented Jun 8, 2020

What's making it so my fix is only being pushed to staging.openttd.org (and only that website) instead of also being pushed to the regular www.openttd.org? It's been 5 days since this was merged, so it should have been pushed to www.openttd.org by now.

One possible reason might be that the change is not a critical fix, meaning that it is only pushed to www.openttd.org along with, for example, a new news post. In this case, I may have to wait until OpenTTD 1.11.0-beta1 is released in order to see the change live on www.openttd.org.

@auge8472
Copy link
Contributor

auge8472 commented Jun 8, 2020

When a PR got merged, it moves to staging.openttd.org. Until a new version of the website gets released, merged changes stays in the "staging area".

Please stay patient and tuned. :-)

@LordAro
Copy link
Member

LordAro commented Jun 8, 2020

(It's very unlikely that you'll have to wait until 1.11.0-beta1, which is many months away)

@auge8472
Copy link
Contributor

auge8472 commented Jun 8, 2020

What's with the (not so) monthly dev posts? Maybe the next gets released before 1.11.0-beta1 (or 1.10.3). :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

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