From 934de01803fd72ad08440d2ad540b5c0c4587ce7 Mon Sep 17 00:00:00 2001 From: Willyb321 Date: Wed, 21 Nov 2018 08:50:53 +1100 Subject: [PATCH] add announcements to actual page --- src/app/Coriolis.jsx | 2 ++ src/app/components/Announcement.jsx | 2 +- src/less/app.less | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx index 8041ccff..0595b41c 100644 --- a/src/app/Coriolis.jsx +++ b/src/app/Coriolis.jsx @@ -6,6 +6,7 @@ import { EventEmitter } from 'fbemitter'; import { getLanguage } from './i18n/Language'; import Persist from './stores/Persist'; +import Announcement from './components/Announcement'; import Header from './components/Header'; import Tooltip from './components/Tooltip'; import ModalExport from './components/ModalExport'; @@ -395,6 +396,7 @@ export default class Coriolis extends React.Component { return
+
{this.state.announcements.map(a => )}
{this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) : } {this.state.modal} diff --git a/src/app/components/Announcement.jsx b/src/app/components/Announcement.jsx index 76a3bdb5..1c2df735 100644 --- a/src/app/components/Announcement.jsx +++ b/src/app/components/Announcement.jsx @@ -25,7 +25,7 @@ export default class Announcement extends React.Component { * @return {React.Component} A href element */ render() { - return

{this.props.text}

; + return
{this.props.text}
; } } diff --git a/src/less/app.less b/src/less/app.less index 69c72d71..566a9825 100755 --- a/src/less/app.less +++ b/src/less/app.less @@ -171,3 +171,16 @@ footer { text-align: right; } } + +.announcement-container { + display: flex; + align-items: center; + padding-top: 10px; + justify-content: center; + flex-flow: row wrap; +} + +.announcement { + border: 1px @secondary solid; + padding: 10px; +}