-
Notifications
You must be signed in to change notification settings - Fork 58
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
feat(bc-footer): Add Brand.com Footer #1450
Merged
hvanyo
merged 37 commits into
johnsonandjohnson:main
from
Guilherme-Almeida-Zeni:feature/bc-footer
Mar 29, 2022
Merged
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
22775bb
feature(bc-footer): Add Brand.com Footer
130129b
Merge branch 'main' into feature/bc-footer
Guilherme-Almeida-Zeni 4ef4a43
feature(bc-footer): Final Styles Adjustments
c3ba7f4
feature(bc-footer): Copyright as RTE, Add TODO On Social Links AND Re…
33e8f47
feature(bc-footer): Move Sepator Styles To Its Own Token
b13f2be
feature(bc-footer): Rename GlobalFooter To Footer
078e5b9
feature(bc-footer): Address PR Feedback - Batch 1
5b9cba8
Reorganize menu. (#7)
wodenx dd33b8c
feature(bc-footer): Update Footer Menu Data
607adfe
feature(bc-footer): Update Package.Lock
406445f
feature(bc-footer): Remove Console Log From Menu Separator
8eeca7c
feature(bc-footer): Improve Footer Structure For Later Static Impleme…
4847391
feature(bc-footer): Add Todo Comments
c2892b6
feature(bc-footer): Rename SiteHeader And SiteFooter To Header And Fo…
10a8d3d
feature(bc-footer): Add Cx Navigation To TSConfig
1fd9afa
Merge branch 'main' of github.com:Guilherme-Almeida-Zeni/Bodiless-JS …
c4fcf4a
feature(bc-footer): Rename Remaining SiteHeader And SiteFooter To Hea…
e77dc99
feature(bc-footer): Adjust Layout After Updates
5b76db4
Token site constrains (#8)
hvanyo bc1a234
feature(bc-footer): Add Footer Slots Wrappers
9ddb477
feature(bc-footer): Refactor Footer Copyright RichText
57c2330
feature(bc-footer): Update Footer And Copyright Keys
1b86037
feature(bc-footer): Add Footer Page Example
47e925d
feature(bc-footer): Feedback Fixes - Batch 2
a76e723
Merge branch 'main' of github.com:Guilherme-Almeida-Zeni/Bodiless-JS …
e2b1886
feature(bc-footer): Update Cx Navigation Package Version
2e6ac77
Merge branch 'main' into feature/bc-footer
Guilherme-Almeida-Zeni 9ff0098
fix(bc-footer): Fix Footer Issues (#10)
Guilherme-Almeida-Zeni 13740a3
Merge branch 'main' of github.com:Guilherme-Almeida-Zeni/Bodiless-JS …
9642778
feature(bc-footer): Fix issues after main branch update
cedba7b
Merge branch 'main' of github.com:Guilherme-Almeida-Zeni/Bodiless-JS …
ae6c900
fix(bc-footer): Fix footer issues (#13)
guilhermegpessoa 67f8d42
Merge branch 'main' of github.com:Guilherme-Almeida-Zeni/Bodiless-JS …
d3c3f88
Merge branch 'feature/bc-footer' of github.com:Guilherme-Almeida-Zeni…
278cb18
feature(bc-footer): Update Footer Content
972af32
bugfix(bc-footer): Fix Footer Menu Issues Issues (#16)
Guilherme-Almeida-Zeni 1d3b40d
bugfix(bc-footer): Fix Mobile Margins Between Submenus (#17)
Guilherme-Almeida-Zeni File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/** | ||
* Copyright © 2022 Johnson & Johnson | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
export { __cxstarter__Footer } from './tokens'; |
27 changes: 27 additions & 0 deletions
27
packages/__cxstarter__/src/components/Footer/tokens/__cxstarter__Footer.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/** | ||
* Copyright © 2022 Johnson & Johnson | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import { cxFooter, asFooterToken } from '@bodiless/cx-layout'; | ||
|
||
const Default = asFooterToken({ | ||
...cxFooter.Default, | ||
Components: { | ||
...cxFooter.Default.Components, | ||
}, | ||
}); | ||
|
||
export default { | ||
...cxFooter, | ||
Default, | ||
}; |
17 changes: 17 additions & 0 deletions
17
packages/__cxstarter__/src/components/Footer/tokens/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/** | ||
* Copyright © 2022 Johnson & Johnson | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import __cxstarter__Footer from './__cxstarter__Footer'; | ||
|
||
export { __cxstarter__Footer }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
packages/__cxstarter__/src/styleguide/Page/StyleGuideTemplate/Footer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import React from 'react'; | ||
import { asStyleGuideTemplateToken, cxStyleGuideTemplate } from '@bodiless/cx-templates'; | ||
import { flowHoc, replaceWith } from '@bodiless/fclasses'; | ||
|
||
export const Footer = asStyleGuideTemplateToken(cxStyleGuideTemplate.FooterOnly, { | ||
Meta: flowHoc.meta.term('Token')('Footer'), | ||
Content: { | ||
Title: replaceWith(() => <>Footer</>), | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"_dir": "/doc" | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and it looks this copyright editor is also getting cxFontSize.BaseSize from original RTE we need to remove.
Same thing is happening for Links
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has been addressed in this PR: Guilherme-Almeida-Zeni#10