Skip to content
This repository has been archived by the owner on Sep 22, 2021. It is now read-only.

Added Registered Symbol #71

Merged
merged 10 commits into from Jul 19, 2021
Merged

Conversation

linkfang
Copy link
Contributor

@linkfang linkfang commented Jun 24, 2021

For Infra-4243
Got +1 from Sharon

@linkfang linkfang marked this pull request as ready for review July 12, 2021 17:07
@ahus1
Copy link
Contributor

ahus1 commented Jul 13, 2021

Hi @linkfang, thanks for preparing the changes.

Please have a look at the following two things:

  • README.adoc contains a section "Trademarks" - I suppose AsciiDoc should be added there as well.
  • On the main page, the "AsciiDoc Working Group" used to be in one line, now it breaks into two lines. Please adjust (maybe via jumbotron_class in config.toml) that this doesn't break at least on the main page by making is a little wider. See screenshots below.

Thanks!

Before:

image

After:

image

@chrisguindon
Copy link
Member

I created a PR to update our base theme: #76

That PR will be needed to be merged in before this one.

@linkfang Can you make sure to remove layouts/partials/jumbotron.html from your PR. Those changes are now in our base theme. We don't need to override this template anymore.

@linkfang linkfang marked this pull request as ready for review July 14, 2021 14:58
@linkfang
Copy link
Contributor Author

Hi @ahus1 , good catch and good suggestion! Now it's solved!

Hi @chrisguindon , Yeah, sure, it's removed.

@ahus1
Copy link
Contributor

ahus1 commented Jul 14, 2021

@linkfang - the other PR is now merged into main. Unfortunately this PR now has a merge conflict: please resolve them.

Please consider squashing the commits in this ticket before I merge them into main; alternatively I can squash the commits via the GitHub web UI.

@chrisguindon
Copy link
Member

chrisguindon commented Jul 14, 2021

@ahus1 I think it's preferable that you squash them when you merge the PR! That's what I usually do..

@ahus1
Copy link
Contributor

ahus1 commented Jul 14, 2021

@chrisguindon - looking at this issue this is awaiting a review approval from you. Please leave a note here if you plan to do some work here or if you're done.

Besides that I'm now ready to merge.

@mojavelinux
Copy link
Contributor

Is it really necessary to put the registered trademark symbol on AsciiDoc in both the title and the description of the hero? Can't we just put it in one place? If I have a choice, it would be in the description.

@chrisguindon
Copy link
Member

@mojavelinux I will share your question with our Trademark specialist. We are currently acting under their direction for this.

content/_index.adoc Outdated Show resolved Hide resolved
@chrisguindon
Copy link
Member

Is it really necessary to put the registered trademark symbol on AsciiDoc in both the title and the description of the hero? Can't we just put it in one place? If I have a choice, it would be in the description.

We don't need it in both places. We usually add it in the first occurrence of the word but it's fine to only keep it in the description.

@linkfang Can you make this last change please?

…iiDoc to the list of trademarks in the README

Signed-off-by: Alexander Schwartz <alexander.schwartz@gmx.net>
@ahus1 ahus1 merged commit 5350575 into EclipseFdn:main Jul 19, 2021
@ahus1
Copy link
Contributor

ahus1 commented Jul 19, 2021

Thank you for everyone involved here. The change is now live.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants