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

More or less complete rework of the page header #136

Merged
merged 7 commits into from Jan 2, 2020

Conversation

auge8472
Copy link
Contributor

@auge8472 auge8472 commented Jan 2, 2020

Because of the rtl-issue, desccribed in #117, I began to rework the header section. Follwoing changes are part of the PR.

  • organised the header as a flexbox
  • rebuilt the download-fast-box as a list
  • simplified the structure of the logo-container
  • putting all background-related rules (image, position, size) into the shorthand background
  • removed several height and width values because the boxes takes the necessary space themself

I have a question about tha last point. I added the whole list of selectors whose names begins with #openttd-logo-text but I have no clue if some of them might be not in use here. Some of them i.e. like *-bananas, *-noai seems to be intended for use on different subdomains. Are there selectors I can remove without breaking things on another place?

Edit: Forgot to add the screenshots for ltr (left-to-right-languages) and rtl ones.

left to right:
header of the OpenTTD-website in left to right mode

right to left:
header of the OpenTTD-website in right to left mode

@LordAro
Copy link
Member

LordAro commented Jan 2, 2020

I like it. Can you rebase to get rid of the merge commit? We don't like those :)

@auge8472
Copy link
Contributor Author

auge8472 commented Jan 2, 2020

I like it. Can you rebase to get rid of the merge commit? We don't like those :)

I'm a bit at a loss. How to rebase "to get rid of the merge commit"? I've never done that before …

Or do you mean a simple squash? Can you please provide a link if you mean something different?

Xth edit: I think, I'm back on the track. Tie the branch to another commit (current last commit) of the master branch.

@LordAro
Copy link
Member

LordAro commented Jan 2, 2020

Basically just rebase as you would normally - the merge commit will disappear

@LordAro LordAro merged commit 1b340a1 into OpenTTD:master Jan 2, 2020
@auge8472 auge8472 deleted the page-header branch January 2, 2020 21:16
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.

None yet

2 participants