Skip to content

Commit 1aa6b3e

Browse files
committed
feat: Update styling for indigo footer
1 parent 879f384 commit 1aa6b3e

File tree

6 files changed

+226
-102
lines changed

6 files changed

+226
-102
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release CI
22
on:
33
push:
44
branches:
5-
- master
5+
- quince/indigo
66
jobs:
77
release:
88
name: Release

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@edx/frontend-component-footer",
3-
"version": "1.0.0-semantically-released",
2+
"name": "@edly-io/indigo-frontend-component-footer",
3+
"version": "1.0.0",
44
"description": "Footer component for use when building Open edX frontend applications",
55
"main": "dist/index.js",
66
"publishConfig": {
@@ -24,14 +24,14 @@
2424
},
2525
"repository": {
2626
"type": "git",
27-
"url": "git+https://github.com/openedx/frontend-component-footer.git"
27+
"url": "git+https://github.com/edly-io/frontend-component-footer.git"
2828
},
2929
"author": "edX",
3030
"license": "AGPL-3.0",
3131
"bugs": {
32-
"url": "https://github.com/openedx/frontend-component-footer/issues"
32+
"url": "https://github.com/edly-io/frontend-component-footer/issues"
3333
},
34-
"homepage": "https://github.com/openedx/frontend-component-footer#readme",
34+
"homepage": "https://github.com/edly-io/frontend-component-footer#readme",
3535
"devDependencies": {
3636
"@edx/brand": "npm:@edx/[email protected]",
3737
"@edx/browserslist-config": "^1.1.1",
@@ -63,5 +63,11 @@
6363
"prop-types": "^15.5.10",
6464
"react": "^16.9.0 || ^17.0.0",
6565
"react-dom": "^16.9.0 || ^17.0.0"
66+
},
67+
"release": {
68+
"branches": [
69+
"master",
70+
"quince/indigo"
71+
]
6672
}
6773
}

src/components/Footer.jsx

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
44
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
55
import { ensureConfig } from '@edx/frontend-platform/config';
66
import { AppContext } from '@edx/frontend-platform/react';
7+
import { Image } from '@edx/paragon';
8+
import { getConfig } from '@edx/frontend-platform';
79

810
import messages from './Footer.messages';
911
import LanguageSelector from './LanguageSelector';
@@ -41,34 +43,45 @@ class SiteFooter extends React.Component {
4143
intl,
4244
} = this.props;
4345
const showLanguageSelector = supportedLanguages.length > 0 && onLanguageSelected;
44-
const { config } = this.context;
46+
const config = getConfig();
4547

4648
return (
47-
<footer
48-
role="contentinfo"
49-
className="footer d-flex border-top py-3 px-4"
50-
>
51-
<div className="container-fluid d-flex">
52-
<a
53-
className="d-block"
54-
href={config.LMS_BASE_URL}
55-
aria-label={intl.formatMessage(messages['footer.logo.ariaLabel'])}
56-
>
57-
<img
58-
style={{ maxHeight: 45 }}
59-
src={logo || config.LOGO_TRADEMARK_URL}
60-
alt={intl.formatMessage(messages['footer.logo.altText'])}
61-
/>
62-
</a>
63-
<div className="flex-grow-1" />
49+
<div className="wrapper wrapper-footer">
50+
<footer id="footer" className="tutor-container">
51+
<div className="footer-top">
52+
<div className="powered-area">
53+
<ul className="logo-list">
54+
<li>{intl.formatMessage(messages['footer.poweredby.text'])}</li>
55+
<li>
56+
<a href="https://docs.tutor.overhang.io" rel="noreferrer" target="_blank">
57+
<Image
58+
src={`${config.LMS_BASE_URL}/static/indigo/images/tutor-logo.png`}
59+
alt={intl.formatMessage(messages['footer.tutorlogo.altText'])}
60+
width="57"
61+
/>
62+
</a>
63+
</li>
64+
<li>
65+
<a href="https://open.edx.org" rel="noreferrer" target="_blank">
66+
<Image
67+
src={logo || `${config.LMS_BASE_URL}/static/indigo/images/openedx-logo.png`}
68+
alt={intl.formatMessage(messages['footer.logo.altText'])}
69+
width="79"
70+
/>
71+
</a>
72+
</li>
73+
</ul>
74+
</div>
75+
</div>
76+
<span className="copyright-site">{intl.formatMessage(messages['footer.copyright.text'])}</span>
6477
{showLanguageSelector && (
6578
<LanguageSelector
6679
options={supportedLanguages}
6780
onSubmit={onLanguageSelected}
6881
/>
6982
)}
70-
</div>
71-
</footer>
83+
</footer>
84+
</div>
7285
);
7386
}
7487
}

src/components/Footer.messages.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,31 @@ const messages = defineMessages({
136136
defaultMessage: 'Download the edX mobile app from Google Play',
137137
description: 'The label for the link to download the google version of the edX app.',
138138
},
139+
'footer.poweredby.text': {
140+
id: 'footer.poweredby.text',
141+
defaultMessage: 'Powered by',
142+
description: 'text for the footer',
143+
},
139144
'footer.logo.altText': {
140145
id: 'footer.logo.altText',
141146
defaultMessage: 'Powered by Open edX',
142147
description: 'alt text for the footer logo.',
143148
},
149+
'footer.tutorlogo.altText': {
150+
id: 'footer.tutorlogo.altText',
151+
defaultMessage: 'Runs on Tutor',
152+
description: 'alt text for the footer tutor logo',
153+
},
144154
'footer.logo.ariaLabel': {
145155
id: 'footer.logo.ariaLabel',
146156
defaultMessage: 'edX Home',
147157
description: 'aria-label for the footer logo.',
148158
},
159+
'footer.copyright.text': {
160+
id: 'footer.copyright.text',
161+
defaultMessage: 'Copyrights ©2023. All Rights Reserved.',
162+
description: 'copyright text for the footer',
163+
},
149164
'footer.ariaLabel': {
150165
id: 'footer.ariaLabel',
151166
defaultMessage: 'Page Footer',

0 commit comments

Comments
 (0)