diff --git a/source/components/pages/Header.css b/source/components/pages/Header.css index dd33cafe1..5dda2ca55 100644 --- a/source/components/pages/Header.css +++ b/source/components/pages/Header.css @@ -76,11 +76,21 @@ nav a { text-align: center; background: #eee; display: block; - width: 20em; + width: 12em; margin: 0 auto; - padding: 0.6em 1em; + padding: 0.4em 1em; cursor: pointer; } +#iframeFullscreen.absolute { + padding: 0; +} #iframeFullscreen i { margin-left: 1em; } + +#iframeFullscreen.absolute i { + position: absolute; + top: 0.2em; + right: 0.3em; + font-size: 150%; +} diff --git a/source/components/pages/Header.js b/source/components/pages/Header.js index d751a901e..3f7baf5b8 100644 --- a/source/components/pages/Header.js +++ b/source/components/pages/Header.js @@ -3,9 +3,12 @@ import 'Components/pages/Header.css' import { Link } from 'react-router-dom' import screenfull from 'screenfull' import { connect } from 'react-redux' +import { withRouter } from 'react-router' +@withRouter @connect(state => ({ - iframe: state.iframe + iframe: state.iframe, + textColourOnWhite: state.themeColours.textColourOnWhite })) export default class Header extends Component { state = { @@ -15,17 +18,26 @@ export default class Header extends Component { this.setState({ mobileNavVisible: !this.state.mobileNavVisible }) render() { + let { location } = this.props + let appMode = ['/simu', '/regle'].find(t => location.pathname.includes(t)) if (this.props.iframe) return screenfull.enabled ? ( -
screenfull.toggle()}> - Mode plein écran -