diff --git a/src/assets/fa-logo.png b/src/assets/fa-logo.png new file mode 100644 index 0000000..3076a46 Binary files /dev/null and b/src/assets/fa-logo.png differ 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