diff --git a/package.json b/package.json index d4fe4fafc..bf4d43169 100644 --- a/package.json +++ b/package.json @@ -107,6 +107,7 @@ "node-mocks-http": "1.6.7", "node-sass": "4.9.0", "normalize.css": "8.0.0", + "optimize-css-assets-webpack-plugin": "4.0.1", "ora": "1.4.0", "prop-types": "15.6.1", "puppeteer": "1.1.1", diff --git a/src/webui/src/components/Header/header.scss b/src/webui/src/components/Header/header.scss index 860102c4b..0f53c2263 100644 --- a/src/webui/src/components/Header/header.scss +++ b/src/webui/src/components/Header/header.scss @@ -6,13 +6,13 @@ width: 100%; align-items: center; background: $primary-color; + color: #fff; figure { margin: 0 0 0 10px; font-size: 14px; line-height: 18px; padding: 8px 0; - color: #f9f2f4; } .headerWrap { @@ -22,13 +22,24 @@ @include container-size(); } + .headerRight { + margin-left: auto; + } + .logo { height: 50px; } - .welcome { - margin-left: auto; - color: white; + .headerButton { + color: inherit; + border-color: #fff; + background-color: transparent; + + &:hover, &:focus { + color: $primary-color; + border-color: #f7f8f6; + background-color: #f7f8f6; + } } } diff --git a/src/webui/src/components/Header/index.js b/src/webui/src/components/Header/index.js index 573c29290..3426805c1 100644 --- a/src/webui/src/components/Header/index.js +++ b/src/webui/src/components/Header/index.js @@ -129,14 +129,13 @@ export default class Header extends React.Component { renderUserActionButton() { if (!this.isTokenExpire) { // TODO: Check jwt token expire return ( -
- Hi, {storage.getItem('username')} -   - +
+ Hi, {storage.getItem('username')} +
); } else { - return ; + return ; } } @@ -154,7 +153,10 @@ export default class Header extends React.Component {
npm adduser --registry { registryURL } - {this.renderUserActionButton()} + +
+ {this.renderUserActionButton()} +
snapshot test shoud match snapshot 1`] = `"
npm set registry nullblank
npm adduser --registry nullblank
Login



"`; +exports[`
snapshot test shoud match snapshot 1`] = `"
npm set registry nullblank
npm adduser --registry nullblank
Login



"`; diff --git a/tools/webpack.prod.config.babel.js b/tools/webpack.prod.config.babel.js index 5ff27948a..1f79634d9 100644 --- a/tools/webpack.prod.config.babel.js +++ b/tools/webpack.prod.config.babel.js @@ -2,6 +2,7 @@ const webpack = require('webpack'); const HTMLWebpackPlugin = require('html-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const UglifyJsWebpackPlugin = require('uglifyjs-webpack-plugin'); +const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const baseConfig = require('./webpack.config'); const env = require('../src/config/env'); const _ = require('lodash'); @@ -44,6 +45,7 @@ const prodConf = { new UglifyJsWebpackPlugin({ sourceMap: true, }), + new OptimizeCSSAssetsPlugin({}), ], }, }; diff --git a/yarn.lock b/yarn.lock index 0e1d9da5e..73ec89589 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2802,7 +2802,7 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" -cssnano@^3.10.0: +cssnano@^3.10.0, cssnano@^3.4.0: version "3.10.0" resolved "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" dependencies: @@ -6000,6 +6000,13 @@ known-css-properties@^0.6.0: version "0.6.1" resolved "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.6.1.tgz#31b5123ad03d8d1a3f36bd4155459c981173478b" +last-call-webpack-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555" + dependencies: + lodash "^4.17.5" + webpack-sources "^1.1.0" + lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -7219,6 +7226,13 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" +optimize-css-assets-webpack-plugin@4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-4.0.1.tgz#48f016766752c7648b92cc1e795b999732bd87a2" + dependencies: + cssnano "^3.4.0" + last-call-webpack-plugin "^3.0.0" + optionator@^0.8.1, optionator@^0.8.2: version "0.8.2" resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"