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

Changed website to FINOS Branding & changes to Custom CSS & New Logos #96

Merged
merged 31 commits into from
Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
da4b54f
Merge pull request #1 from FDC3/master
grizzwolf May 14, 2019
01d470d
Changed CSS to reflect FINOS style guidlines & added current FDC3 logos
grizzwolf May 20, 2019
5288b2f
change URL for staging changes
grizzwolf May 20, 2019
581ed80
change to grizzwolf/ fix wrapper URL
grizzwolf May 20, 2019
e5b17ad
change org name
grizzwolf May 20, 2019
0f9ec0f
traling slash
grizzwolf May 20, 2019
312b56a
remove trailing slash from /img
grizzwolf May 20, 2019
d597eae
changed back trailing slashes - issues with links to img files. Also …
grizzwolf May 21, 2019
55a4f09
added /FDC3/ to URL
grizzwolf May 21, 2019
1c9e334
removed URL slash infront of Users.json
grizzwolf May 21, 2019
5189408
removed / for home container img
grizzwolf May 21, 2019
ab49936
added correct URL for background image
grizzwolf May 21, 2019
b1ee5ed
changed Featured area - Use Cases background color and padding
grizzwolf May 21, 2019
5950ed5
moved FINOS logo to bottom of footer
grizzwolf May 21, 2019
6664c2e
made FINOS image smaller on footer
grizzwolf May 21, 2019
a684a9f
fixed finos logo on all footers (both home and docs)
grizzwolf May 21, 2019
912da24
added hover state for mobile nav & resized footer margin between nav …
grizzwolf May 21, 2019
826370d
changed API / Intents svg colors to black for FDC3 PMC review / decis…
grizzwolf May 23, 2019
8275b71
changed background / link colors to fit correct FINOS branding palette
grizzwolf May 29, 2019
be5ad6c
changed svg colors and made footer logo just icon
grizzwolf Jun 27, 2019
482ff76
Added documentation in the README.md file - Added the ## Custom CSS &…
grizzwolf Jun 27, 2019
4a77683
fixed link in readme.md in custom CSS section
grizzwolf Jun 27, 2019
ea125d1
removed h2 tag from README.md
grizzwolf Jun 27, 2019
c528e24
changed siteConfig.js back to FDC3 defaults instead of grizzwolf test…
grizzwolf Jun 27, 2019
c73a665
added padding to interior pages - changed color scheme of nav in res…
grizzwolf Jul 5, 2019
d2dfa45
added "/' to users.json - (without the "/" works on local but not onl…
grizzwolf Jul 5, 2019
1b70ec4
changed "/" to be consistent
grizzwolf Jul 5, 2019
ad510d5
changed siteConfig to reflect FDC3/FDC3 version - changed users.json …
grizzwolf Jul 5, 2019
32ef1d0
reverting briefly to make https://grizzwolf.github.io/FDC3/ (Glue42 l…
grizzwolf Jul 5, 2019
641ae4b
changed user.json temp to fix Travis CI build
grizzwolf Jul 5, 2019
b44bc69
reverting temporary changes made for base URL to merge with current PR96
grizzwolf Jul 5, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/assets/fdc3-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions finos_wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions footerimg/finos_wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions website/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,32 @@ For more information about the navigation bar, click [here](https://docusaurus.i

For more information about custom pages, click [here](https://docusaurus.io/docs/en/custom-pages).

## Custom CSS & Design Changes

1. Changing logos for the Header and Footer and Favicon are done in website/siteConfig.js file in the /* path to images for header/footer */ section

Note: make sure that you add your new logos to the website/static/img folder first.

2. Change the main logo in the "SplashContainer" area of website/index.js file.

Note: make sure that you add your new logos to the website/static/img folder first.

3. Change the background color and the background transparent image in the website/static/css/custom.css file.

Go to the section labeled: .homeContainer

Change "background-image" - and insert your new background image file. Note - make sure you add your new background transparent image file to the website/static/img folder first.

Change "background-color" to your Project's main color (FDC3 is #0033A0)

4. Change the .svg icons in the "gridBlock" (examples on FDC3 - the 4 .svg icons for API / Intents / Context Data / App Director) - you have to open the actual .svg files in the website/static/img folder with a program like Adobe Illustrator. Change the color of the entire file to your Project's main color (FDC3 is #0033A0) - and then save the file. The icon will change color. (NOote - If there is a way to change the .svg's using CSS, have not been able to do so yet. It should be possible.)

5. Change the section header titles (example for FDC3: Use Cases & Who is Usind FDC3) by changing the website/static/css/custom.css file. Change the h2 tags for .featureShowcaseSection h2 and .productShowcaseSection h2 to your Project's color (FDC3 is #0033A0).

6. Interior Introduction Page - Change logo by on this page (example for FDC3: docs/fdc3-intro.md) by changing the "(assets/fdc3-logo.png)" to the new logo name.

Note: make sure that you add your new logo to the docs/assets folder first - this is a separate image repository from the "website" part.

# Full Documentation

Full documentation can be found on the [website](https://docusaurus.io/).
16 changes: 15 additions & 1 deletion website/core/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
* LICENSE file in the root directory of this source tree.
*/





const React = require('react');

class Footer extends React.Component {
Expand All @@ -26,7 +30,7 @@ class Footer extends React.Component {
render() {
return (
<footer className="nav-footer" id="footer">
<section className="sitemap">
<section className="sitemap">
<a href={this.props.config.baseUrl} className="nav-home">
{this.props.config.footerIcon && (
<img
Expand Down Expand Up @@ -114,11 +118,21 @@ class Footer extends React.Component {
)}
</div>
</section>
<section className="finos finosBanner">
<a href="https://www.finos.org">
<img id="finosicon" src={`https://grizzwolf.github.io/FDC3/img/finos_wordmark.svg`} height='75px' alt="FINOS" title="FINOS"/>
<h2 id="proud">Proud member of the Fintech Open Source Foundation</h2>
</a>

</section>

<section className="copyright">{this.props.config.copyright}</section>

</footer>
);
}
}



module.exports = Footer;
7 changes: 7 additions & 0 deletions website/data/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"pinned": true,
"isMember": false
},
{
"caption": "Chart IQ",
"image": "/img/users/ChartIQ.webp",
"infoLink": "https://www.chartiq.com/",
"pinned": true,
"isMember": true
},
{
"caption": "FactSet",
"image": "/img/users/FactSet.webp",
Expand Down
48 changes: 27 additions & 21 deletions website/pages/en/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ class HomeSplash extends React.Component {

const ProjectTitle = () => (
<h2 className="projectTitle">
{siteConfig.title}
{/*siteConfig.title*/}
<small>{siteConfig.tagline}</small>
</h2>

);

const PromoSection = props => (
Expand All @@ -63,14 +64,16 @@ class HomeSplash extends React.Component {

return (
<SplashContainer>
{/* <Logo img_src={`${baseUrl}img/docusaurus.svg`} /> */}
<div className="inner">
<ProjectTitle siteConfig={siteConfig} />
<PromoSection>
<Button href={docUrl('fdc3-intro')}>Get Started</Button>
<Button href={repoUrl}>GitHub</Button>
</PromoSection>
</div>
{/*<Logo img_src={`${baseUrl}img/docusaurus.svg`} />*/}
<div className="inner">
<img src="img/fdc3-logo-2019.png"></img>

<ProjectTitle siteConfig={siteConfig} />
<PromoSection>
<Button href={docUrl('fdc3-intro')}>Get Started</Button>
<Button href={repoUrl}>GitHub</Button>
</PromoSection>
</div>
</SplashContainer>
);
}
Expand Down Expand Up @@ -100,7 +103,7 @@ class Index extends React.Component {
);

const Features = () => (
<Block background="light" layout="fourColumn">
<Block background="white" layout="fourColumn">
{[
{
content: `Create a consistent developer experience by adhering to the [API](${docUrl('api/api-intro')}) standard`,
Expand Down Expand Up @@ -133,20 +136,20 @@ class Index extends React.Component {
);

const FeatureCallout = () => (
<div className="productShowcaseSection paddingBottom" style={{textAlign: 'center'}}>
<div className="featureShowcaseSection paddingBottom" style={{textAlign: 'center'}}>
<h2>Use Cases</h2>
<MarkdownBlock>{`Document business [use cases](${docUrl('use-cases/overview')}) that drive FDC3 interoperability standards.`}</MarkdownBlock>
</div>
);

const FinosBanner = () => (
<div className="finos lightBackground">
<h2>Proud member of the Fintech Open Source Foundation</h2>
<a href="https://www.finos.org">
<img src={`${baseUrl}img/finos_wordmark.svg`} height='150px' alt="FINOS" title="FINOS"/>
</a>
</div>
);
//const FinosBanner = () => (
//<div className="finos finosBanner">
//<a href="https://www.finos.org">
//<img id="finosicon" src={`${baseUrl}img/finos_wordmark.svg`} height='150px' alt="FINOS" title="FINOS"/>
//</a>
//<h2 id="proud">Proud member of the Fintech Open Source Foundation</h2>
//</div>
//);

const UserShowcase = () => {
if ((siteConfig.users || []).length === 0) {
Expand All @@ -158,7 +161,7 @@ class Index extends React.Component {
const pageUrl = page => baseUrl + (language ? `${language}/` : '') + page;

return (
<div className="userShowcase productShowcaseSection paddingBottom">
<div className="userShowcase productShowcaseSection paddingTop paddingBottom">
<h2>Who is Using FDC3?</h2>
<p>The Financial Desktop Connectivity and Collaboration Consortium (FDC3) was founded in 2017 by <a href="https://openfin.co">OpenFin</a> and contributed to <a href="https://finos.org">FINOS</a>. The FDC3 standards are created and used by leading organizations across the financial industry.</p>
<Showcase users={pinnedUsers} />
Expand All @@ -178,12 +181,15 @@ class Index extends React.Component {
<div className="mainContainer">
<Features />
<FeatureCallout />
<FinosBanner />

<UserShowcase />

</div>
</div>
);
}
}

module.exports = Index;

//<FinosBanner />
25 changes: 13 additions & 12 deletions website/siteConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
const users = require('./data/users.json');

const siteConfig = {
title: 'FDC3', // Title for your website.
tagline: 'Open standards for the financial desktop',
title: 'FDC3', // Title for your website. THIS CHANGES THE TITLE TAGS FOR THE WEBSITE (LOOK IN BROWSER TAB AT TOP)
tagline: 'Open standards for the financial desktop', //THIS CHANGES THE TITLE TAGS FOR THE WEBSITE (LOOK IN BROWSER TAB AT TOP)
url: 'https://fdc3.finos.org',
Copy link
Contributor

@rikoe rikoe Jul 5, 2019

Choose a reason for hiding this comment

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

Ah. I see what happened now. This is a thorny problem to solve, it happened to me too. I think it is an unresolved issue on Docusaurus, how to target the same config & website at different URLs.

👍

Copy link
Member Author

Choose a reason for hiding this comment

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

yes - that's better than my explanation. It was frustrating when we couldn't get it running, and figured out the base URL change (when forking in personal repos). Let me know if any issues other than that.

cname: 'fdc3.finos.org',
baseUrl: '/',
Expand All @@ -32,20 +32,21 @@ const siteConfig = {

defaultVersionShown: '1.0',

twitterUsername: 'fdc3_',
twitterUsername: 'FDC3_',

// If you have users set above, you add it here:
users,

/* path to images for header/footer */
headerIcon: 'img/finos-white.png',
footerIcon: 'img/finos.png',
favicon: 'img/favicon/favicon.ico',
headerIcon: 'img/fdc3-icon-2019.svg', /* change to program/project icon logo */
footerIcon: 'img/fdc3-icon-2019.svg', /* change to program/project icon + wordmark logo */
favicon: 'img/favicon/favicon.ico', /* change to program/project favicon logo .ico */

/* Colors for website */
colors: {
primaryColor: '#00b5e2',
secondaryColor: '#0086bf'
primaryColor: '#0086bf', /* This changes the top FINOS banner & all links - DO NOT CHANGE */
secondaryColor: '#0033A0' /* This does net change anything - but keep as the project / program main color */

},

/* Custom fonts for website */
Expand All @@ -63,7 +64,7 @@ const siteConfig = {
*/

// This copyright info is used in /core/Footer.js and blog RSS/Atom feeds.
copyright: `Copyright © ${new Date().getFullYear()} FDC3`,
copyright: `Copyright © ${new Date().getFullYear()} FDC3`, /* CHANGE THIS TO PROJECT / PROGRAM NAME */

highlight: {
// Highlight.js theme to use for syntax highlighting in code blocks.
Expand All @@ -82,8 +83,8 @@ const siteConfig = {
docsSideNavCollapsible: true,

// Open Graph and Twitter card images.
ogImage: 'img/docusaurus.png',
twitterImage: 'img/docusaurus.png',
ogImage: 'assets/fdc3-logo.png', /* change to program/project icon + wordmark logo */
twitterImage: 'assets/fdc3-logo.png', /* change to program/project icon + wordmark logo */

// Show documentation's last contributor's name.
// enableUpdateBy: true,
Expand All @@ -93,7 +94,7 @@ const siteConfig = {

// You may provide arbitrary config keys to be used as needed by your
// template. For example, if you need your repo's URL...
repoUrl: 'https://github.com/FDC3/FDC3'
repoUrl: 'https://grizzwolf.github.io/FDC3/'
};

module.exports = siteConfig;
Loading