From 84d6c8b33adcce0fef93b982fcdd9599a22ef89d Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 1 Feb 2018 20:20:45 +0100 Subject: [PATCH 1/5] calculating splash styles with variables --- app/index.ejs | 43 +----------------------------- app/src/renderer/styles/index.styl | 42 +++++++++++++++++++++++++++++ webpack.renderer.config.js | 5 +++- 3 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 app/src/renderer/styles/index.styl diff --git a/app/index.ejs b/app/index.ejs index 9d51271baf..8d3019b0ba 100644 --- a/app/index.ejs +++ b/app/index.ejs @@ -21,46 +21,5 @@ diff --git a/app/src/renderer/styles/index.styl b/app/src/renderer/styles/index.styl new file mode 100644 index 0000000000..3455abea0a --- /dev/null +++ b/app/src/renderer/styles/index.styl @@ -0,0 +1,42 @@ +body { margin: 0; } +#load { + display: flex; + align-items: center; + justify-content: center; + width: 100vw; + height: 100vh; + background: app-bg; +} +#load-container { + font: 16px/1.5 system, -apple-system, BlinkMacSystemFont, "Roboto", "Seogue UI", "Helvetica Neue", "Lucida Grande", sans-serif; + margin: 0 auto; + width: 18rem; + display: flex; + flex-flow: column nowrap; + justify-content: center; + box-sizing: border-box; +} +#load-title { + font-size: h2; + font-weight: 600; + line-height: 1; + text-transform: uppercase; + letter-spacing: 0.25rem; + color: bright; + margin-bottom: 1rem; + padding: 0 0.5rem; +} + +#load-main p { + font-size: m; + line-height: 2rem; + font-weight: 300; + padding: 0 0.5rem; + color: dim; + background: app-fg; + margin: 0 0 1px; +} +#load-main a { + text-decoration: none; + color: link; +} \ No newline at end of file diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js index 55e30bd121..520697cbaf 100644 --- a/webpack.renderer.config.js +++ b/webpack.renderer.config.js @@ -5,6 +5,8 @@ process.env.BABEL_ENV = 'renderer' const path = require('path') const settings = require('./config.js') const webpack = require('webpack') +const stylus = require('stylus') +const fs = require('fs-extra') const ExtractTextPlugin = require('extract-text-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') @@ -87,7 +89,8 @@ let rendererConfig = { template: './app/index.ejs', appModules: process.env.NODE_ENV !== 'production' ? path.resolve(__dirname, 'app/node_modules') - : false + : false, + styles: stylus(fs.readFileSync('./app/src/renderer/styles/index.styl', 'utf8')).import('./app/src/renderer/styles/variables.styl').render() }), new webpack.NoEmitOnErrorsPlugin(), // warnings caused by websocket-stream, which has a server-part that is unavailable on the the client From 09a09667fe6a348e34fcade4f3c9b2a56f968010 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Jan 2018 16:17:09 +0100 Subject: [PATCH 2/5] testing codecov.io --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 483437d7b3..0485b72c74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ # version: 2 jobs: - build: + test: docker: # specify the version you desire here - image: circleci/node:9.4.0-browsers @@ -12,8 +12,6 @@ jobs: working_directory: ~/repo steps: - - run: sudo npm i -g codeclimate-test-reporter - - checkout # Download and cache dependencies @@ -33,4 +31,5 @@ jobs: - run: yarn lint - run: yarn run test - - run: codeclimate-test-reporter < test/unit/coverage/lcov.info \ No newline at end of file + post: + - bash <(curl -s https://codecov.io/bash) \ No newline at end of file From da603102f7b2ddc63b5a7c8e8839a4a6f21ed34b Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Jan 2018 16:23:54 +0100 Subject: [PATCH 3/5] renamed test to build step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0485b72c74..d05ea63459 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ # version: 2 jobs: - test: + build: docker: # specify the version you desire here - image: circleci/node:9.4.0-browsers From dca9484badbd52fdc46814ac7a9e5df81b89eaf0 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Jan 2018 16:51:35 +0100 Subject: [PATCH 4/5] added codecov token --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d05ea63459..2dd60d4e78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,4 +32,4 @@ jobs: - run: yarn lint - run: yarn run test post: - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN \ No newline at end of file From 074dd936aee82689f24cb42e4d8f0102f1ea604c Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Jan 2018 16:58:43 +0100 Subject: [PATCH 5/5] add codecov config --- codecov.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 codecov.yaml diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 0000000000..35b384e8bd --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,19 @@ +coverage: + precision: 2 + round: down + range: "70...100" + + status: + project: + default: on + patch: + default: on + changes: + default: off + +comment: + layout: "header, reach, diff, flags, files, footer" + behavior: default + require_changes: no + require_base: no + require_head: yes \ No newline at end of file