From e7d0961d03ec050900f664ccf9a9925846f5960c Mon Sep 17 00:00:00 2001 From: Marko Kungla Date: Sat, 10 Feb 2018 14:45:56 +0100 Subject: [PATCH] Update gh-pages style --- devel/webpack.common.js | 27 +++++++++---------- package.json | 2 +- src/js/app.js | 2 +- src/style/app/_entry.scss | 2 +- ...github.io.scss => _mkungla-github-io.scss} | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) rename src/style/app/{_mkungla.github.io.scss => _mkungla-github-io.scss} (95%) diff --git a/devel/webpack.common.js b/devel/webpack.common.js index db16abf..a3e16af 100644 --- a/devel/webpack.common.js +++ b/devel/webpack.common.js @@ -173,21 +173,18 @@ module.exports = { }, { // additional css extracted to style/app-theme.css test: /\.css$/, - use: extractDefaultTheme.extract({ - fallback: 'style-loader', - use: [ - { loader: 'css-loader', options: { sourceMap: isDev } }, - { loader: 'postcss-loader', - options: { - sourceMap: true, - plugins: (loader) => [ - require('autoprefixer')({browsers: ['last 3 versions', 'iOS 9']}) - ] - } - }, - 'resolve-url-loader' - ] - }) + use: [ + { loader: 'css-loader', options: { sourceMap: isDev } }, + { loader: 'postcss-loader', + options: { + sourceMap: true, + plugins: (loader) => [ + require('autoprefixer')({browsers: ['last 3 versions', 'iOS 9']}) + ] + } + }, + 'resolve-url-loader' + ] }, { // blue theme extracted to style/app-theme-blue.css test: /app-theme-blue.scss$/, diff --git a/package.json b/package.json index fbcbfda..0390c08 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lint": "npm-run-all lint:*", "lint:stylelint": "stylelint './src/app/sass/**/*.scss' --syntax scss --config ./config/stylelint.json", "lint:standard": "standard -v | snazzy", - "start": "webpack-dev-server --config ./devel/webpack.dev.js", + "start": "NODE_ENV=development webpack-dev-server --config ./devel/webpack.dev.js", "test:ci-on-linux": "echo \"run tests\"", "test:ci-on-mac": "echo \"run tests\"", "test:ci-on-windows": "echo \"run tests\"", diff --git a/src/js/app.js b/src/js/app.js index 6e27cab..1d077c2 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -11,7 +11,7 @@ import '../style/app-theme-yellow.scss' const metadata = require('../metadata') -if (process.env.NODE_ENV !== 'production') { +if (process.env.NODE_ENV !== 'production' && typeof AFRAME !== 'undefined') { const info = AFRAME.utils.debug(`${PROJECT_NAME}:info`) info('Looks like we are in development mode!') info(`Version: ${PROJECT_VERSION}-dev`) diff --git a/src/style/app/_entry.scss b/src/style/app/_entry.scss index fda01b8..3b6adfa 100644 --- a/src/style/app/_entry.scss +++ b/src/style/app/_entry.scss @@ -6,4 +6,4 @@ @import '../config/index'; // https://mkungla.github.io/aframe-webpack-boilerplate/ -@import 'mkungla.github.io'; +@import 'mkungla-github-io'; diff --git a/src/style/app/_mkungla.github.io.scss b/src/style/app/_mkungla-github-io.scss similarity index 95% rename from src/style/app/_mkungla.github.io.scss rename to src/style/app/_mkungla-github-io.scss index d5d6887..fb9296c 100644 --- a/src/style/app/_mkungla.github.io.scss +++ b/src/style/app/_mkungla-github-io.scss @@ -1,6 +1,6 @@ .github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}} html { - background: #33425B; + background: coral; color: #FAFAFA; font-family: monospace; font-size: 20px;