From 678d6695a1c1a2f23cdfeb9c88ad4c6d6890b297 Mon Sep 17 00:00:00 2001 From: Pierre BURGY Date: Fri, 26 Aug 2016 15:32:44 +0200 Subject: [PATCH] Add LeftMenuFooter component --- public/app/components/LeftMenuFooter/index.js | 23 +++++++++++++++++++ .../app/components/LeftMenuFooter/messages.js | 13 +++++++++++ .../app/components/LeftMenuFooter/styles.scss | 16 +++++++++++++ .../LeftMenuFooter/tests/index.test.js | 11 +++++++++ public/app/containers/LeftMenu/index.js | 2 ++ public/app/containers/LeftMenu/styles.scss | 1 + .../styles/variables/variables.bootstrap.scss | 8 +++---- 7 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 public/app/components/LeftMenuFooter/index.js create mode 100644 public/app/components/LeftMenuFooter/messages.js create mode 100644 public/app/components/LeftMenuFooter/styles.scss create mode 100644 public/app/components/LeftMenuFooter/tests/index.test.js diff --git a/public/app/components/LeftMenuFooter/index.js b/public/app/components/LeftMenuFooter/index.js new file mode 100644 index 0000000000..96b6c7cc52 --- /dev/null +++ b/public/app/components/LeftMenuFooter/index.js @@ -0,0 +1,23 @@ +/** +* +* LeftMenuFooter +* +*/ + +import React from 'react'; + +import { FormattedMessage } from 'react-intl'; +import messages from './messages'; +import styles from './styles.scss'; + +class LeftMenuFooter extends React.Component { // eslint-disable-line react/prefer-stateless-function + render() { + return ( +
+ Strapi +
+ ); + } +} + +export default LeftMenuFooter; diff --git a/public/app/components/LeftMenuFooter/messages.js b/public/app/components/LeftMenuFooter/messages.js new file mode 100644 index 0000000000..a8a29fd122 --- /dev/null +++ b/public/app/components/LeftMenuFooter/messages.js @@ -0,0 +1,13 @@ +/* + * LeftMenuFooter Messages + * + * This contains all the text for the LeftMenuFooter component. + */ +import { defineMessages } from 'react-intl'; + +export default defineMessages({ + header: { + id: 'app.components.LeftMenuFooter.header', + defaultMessage: 'Proudly powered by ', + }, +}); diff --git a/public/app/components/LeftMenuFooter/styles.scss b/public/app/components/LeftMenuFooter/styles.scss new file mode 100644 index 0000000000..5606a60189 --- /dev/null +++ b/public/app/components/LeftMenuFooter/styles.scss @@ -0,0 +1,16 @@ +// Import +@import "../../styles/variables/variables"; + +.leftMenuFooter { /* stylelint-disable */ + position: absolute; + width: 100%; + bottom: 0; + height: 3rem; + padding-left: 1rem; + padding-right: 1rem; + line-height: 3rem; + vertical-align: middle; + color: $strapi-gray-light; + border-top: 1px solid $strapi-gray; + font-size: $font-size-xs; +} diff --git a/public/app/components/LeftMenuFooter/tests/index.test.js b/public/app/components/LeftMenuFooter/tests/index.test.js new file mode 100644 index 0000000000..dfb19c65e3 --- /dev/null +++ b/public/app/components/LeftMenuFooter/tests/index.test.js @@ -0,0 +1,11 @@ +// import LeftMenuFooter from '../index'; + +import expect from 'expect'; +// import { shallow } from 'enzyme'; +// import React from 'react'; + +describe('', () => { + it('Expect to have unit tests specified', () => { + expect(true).toEqual(false); + }); +}); diff --git a/public/app/containers/LeftMenu/index.js b/public/app/containers/LeftMenu/index.js index 74f04a06f4..9690ec5293 100644 --- a/public/app/containers/LeftMenu/index.js +++ b/public/app/containers/LeftMenu/index.js @@ -8,6 +8,7 @@ import React from 'react'; import { connect } from 'react-redux'; import LeftMenuHeader from 'components/LeftMenuHeader'; import LeftMenuLinkContainer from 'components/LeftMenuLinkContainer'; +import LeftMenuFooter from 'components/LeftMenuFooter'; import styles from './styles.scss'; export class LeftMenu extends React.Component { // eslint-disable-line react/prefer-stateless-function @@ -16,6 +17,7 @@ export class LeftMenu extends React.Component { // eslint-disable-line react/pre
+
); } diff --git a/public/app/containers/LeftMenu/styles.scss b/public/app/containers/LeftMenu/styles.scss index 71cc4ae08a..00b5c6ada0 100644 --- a/public/app/containers/LeftMenu/styles.scss +++ b/public/app/containers/LeftMenu/styles.scss @@ -6,4 +6,5 @@ height: 100vh; width: $left-menu-width; float: left; + position: relative; } diff --git a/public/app/styles/variables/variables.bootstrap.scss b/public/app/styles/variables/variables.bootstrap.scss index 74f1d31be9..73baa34d5d 100755 --- a/public/app/styles/variables/variables.bootstrap.scss +++ b/public/app/styles/variables/variables.bootstrap.scss @@ -114,7 +114,7 @@ $body-color: $gray-dark !default; $link-color: $brand-primary !default; $link-decoration: none !default; -$link-hover-color: darken($link-color, 15%) !default; +$link-hover-color: $link-color !default; $link-hover-decoration: underline !default; @@ -167,9 +167,9 @@ $font-family-base: $font-family-sans-serif !default; $font-size-root: 16px !default; $font-size-base: 1.4rem !default; -$font-size-lg: 1.25rem !default; -$font-size-sm: .875rem !default; -$font-size-xs: .75rem !default; +$font-size-lg: 1.6rem !default; +$font-size-sm: 1.3rem !default; +$font-size-xs: 1.1rem !default; $line-height-base: 1.5 !default;