From 1150b6b56df12e7ce3ea700bddd1de3ef600c377 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 16 Aug 2019 17:36:19 +0100 Subject: [PATCH] add fa logo at top --- src/assets/fa-logo.png | Bin 0 -> 90140 bytes src/components/TemplateCover.js | 4 +-- src/scss/cover.scss | 9 ++++-- webpack.config.js | 48 ++++++++++++++++---------------- 4 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 src/assets/fa-logo.png diff --git a/src/assets/fa-logo.png b/src/assets/fa-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3076a467a2650756703930403c8198e3edf9ccfc GIT binary patch literal 90140 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 literal 0 HcmV?d00001 diff --git a/src/components/TemplateCover.js b/src/components/TemplateCover.js index fb726a5..f6a56c9 100644 --- a/src/components/TemplateCover.js +++ b/src/components/TemplateCover.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux' import { Player } from 'video-react' import marked from 'marked' import MediaOverlay from './Overlay/Media' - +import logo from '../assets/fa-logo.png' const MEDIA_HIDDEN = -2 /** @@ -117,6 +117,7 @@ class TemplateCover extends React.Component { const { videos } = this.props.cover return (
+
{ this.props.cover.bgVideo ? ( @@ -140,7 +141,6 @@ class TemplateCover extends React.Component {
{this.props.cover.subsubtitle}
) : null } -
{this.props.cover.featureVideo ? this.renderFeature() : null}
diff --git a/src/scss/cover.scss b/src/scss/cover.scss index 56069f5..9fc714d 100644 --- a/src/scss/cover.scss +++ b/src/scss/cover.scss @@ -17,6 +17,11 @@ } } +.cover-logo { + margin-top: 30px; + width: 200px; +} + .fullscreen-bg { &.hidden { top: -100%; @@ -164,8 +169,8 @@ overflow-y: auto; overflow-x: hidden; h1, h2, h3, h4, h5 { text-align: center; } - h1 { margin-bottom: -20px; } - h5 { margin-top: -10px; } + h1 { margin-bottom: -15px; margin-top: 30px; } + h5 { margin-top: -15px; } // mobile styles, remove overlay buttons @media only screen and (max-width: 992px) { diff --git a/webpack.config.js b/webpack.config.js index 5475885..068db75 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,19 +1,19 @@ -const webpack = require('webpack'); -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const HtmlWebpackPlugin = require('html-webpack-plugin'); +const webpack = require('webpack') +const MiniCssExtractPlugin = require('mini-css-extract-plugin') +const HtmlWebpackPlugin = require('html-webpack-plugin') -const devMode = process.env.NODE_ENV !== 'production'; -const path = require('path'); +const devMode = process.env.NODE_ENV !== 'production' +const path = require('path') -const APP_DIR = path.resolve(__dirname, './src'); -const BUILD_DIR = path.resolve(__dirname, './build'); +const APP_DIR = path.resolve(__dirname, './src') +const BUILD_DIR = path.resolve(__dirname, './build') /** env variables from config.js */ -const envConfig = require('./config'); +const envConfig = require('./config') const userConfig = {} const userFeatures = {} for (const k in envConfig) { - userConfig[k] = JSON.stringify(envConfig[k]); + userConfig[k] = JSON.stringify(envConfig[k]) } for (const k in envConfig['features']) { @@ -22,7 +22,7 @@ for (const k in envConfig['features']) { const config = { entry: { - index: `${APP_DIR}/index.jsx`, + index: `${APP_DIR}/index.jsx` }, devtool: 'source-map', module: { @@ -41,14 +41,14 @@ const config = { include: `${APP_DIR}`, use: { loader: 'babel-loader' - }, - }, { - test: /\.(eot|svg|otf|ttf|woff|woff2)$/, - use: { - loader: 'file-loader', } - }, - ], + }, { + test: /\.(eot|svg|otf|ttf|woff|woff2|png)$/, + use: { + loader: 'file-loader' + } + } + ] }, node: { net: 'empty', @@ -56,11 +56,11 @@ const config = { dns: 'empty' }, resolve: { - extensions: ['*', '.js', ], + extensions: ['*', '.js'] }, output: { path: BUILD_DIR, - filename: 'js/[name].bundle.js', + filename: 'js/[name].bundle.js' }, plugins: [ new webpack.DefinePlugin({ @@ -72,12 +72,12 @@ const config = { }), new MiniCssExtractPlugin({ filename: devMode ? '[name].css' : '[name].[hash].css', - chunkFilename: devMode ? '[id].css' : '[id].[hash].css', + chunkFilename: devMode ? '[id].css' : '[id].[hash].css' }), new HtmlWebpackPlugin({ - template: './index.html', + template: './index.html' }) - ], -}; + ] +} -module.exports = config; +module.exports = config