refactor(ZNTA-2465) antd icons

zanata · Apr 9, 2018 · 79da433 · 79da433
1 parent 694fb1c
commit 79da433
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 29 deletions.
diff --git a/server/zanata-frontend/src/app/containers/Languages/index.js b/server/zanata-frontend/src/app/containers/Languages/index.js
@@ -12,7 +12,8 @@ import { debounce, find, isEmpty } from 'lodash'
 import Entry from './Entry'
 import NewLanguageModal from './NewLanguageModal'
 import {Notification, LoaderText} from '../../components'
-import { Button, Icon, Layout } from 'antd'
+import { Button, Layout } from 'antd'
+import Icon from 'antd/lib/icon'
 
 import {
   initialLoad,

diff --git a/server/zanata-frontend/src/app/entrypoint/index.js b/server/zanata-frontend/src/app/entrypoint/index.js
@@ -14,8 +14,8 @@ import rootReducer from '../reducers'
 import Root from '../containers/Root'
 
 import '../editor/index.css'
+import '../../node_modules/antd/dist/antd.css'
 import '../styles/style.less'
-import '../styles/style-0.less'
 
 WebFont.load({
   google: {

diff --git a/server/zanata-frontend/src/app/styles/ant-theme-vars.less b/server/zanata-frontend/src/app/styles/ant-theme-vars.less
@@ -10,3 +10,7 @@
 @highlight-color        : @info-color;
 @warning-color          : #ffa800;
 @normal-color           : #d9d9d9;
+
+.ant-layout {
+  background-color: #fff;
+}
diff --git a/server/zanata-frontend/src/app/styles/style.less b/server/zanata-frontend/src/app/styles/style.less
@@ -1,4 +1,5 @@
 @import "./variables.less";
+@import "./ant-theme-vars";
 @import "../containers/Admin/index.less";
 @import "../containers/Explore/index.less";
 @import "../containers/ProjectVersion/index.less";

diff --git a/server/zanata-frontend/src/package.json b/server/zanata-frontend/src/package.json
@@ -171,6 +171,7 @@
     "normalizr": "2.1.0",
     "postcss": "6.0.16",
     "postcss-cssnext": "3.0.2",
+    "postcss-url": "^7.3.2",
     "prop-types": "15.6.0",
     "react": "15.6.1",
     "react-autosuggest": "9.0.1",

diff --git a/server/zanata-frontend/src/webpack.config.js b/server/zanata-frontend/src/webpack.config.js
@@ -10,11 +10,6 @@ var _ = require('lodash')
 var postcssDiscardDuplicates = require('postcss-discard-duplicates')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var postcssImport = require('postcss-import')
-var postcssCustomProperties = require('postcss-custom-properties')
-var postcssCalc = require('postcss-calc')
-var postcssColorFunction = require('postcss-color-function')
-var postcssCustomMedia = require('postcss-custom-media')
-var postcssEsplit = require('postcss-esplit')
 var CopyWebpackPlugin = require('copy-webpack-plugin')
 var ManifestPlugin = require('webpack-manifest-plugin')
 var cssNano = require('cssnano')
@@ -35,27 +30,11 @@ var postCssLoader = {
   loader: 'postcss-loader',
   options: {
     plugins: [
-      postcssDiscardDuplicates(),
-      postcssImport(),
-      postcssCustomProperties,
-      postcssCalc,
-      cssNano(),
-      postcssColorFunction,
-      postcssCustomMedia,
-      postcssEsplit({
-        quiet: true
-      }),
-
-      autoprefixer({
-        browsers: [
-          'Explorer >= 9',
-          'last 2 Chrome versions',
-          'last 2 Firefox versions',
-          'last 2 Safari versions',
-          'last 2 iOS versions',
-          'Android 4'
-        ]
-      })
+      require('postcss-discard-duplicates'),
+      require('postcss-import')(),
+      require('postcss-url')(),
+      require('postcss-cssnext')(),
+      require('postcss-reporter')(),
     ]
   }
 }
@@ -221,7 +200,6 @@ module.exports = function (env, isEditor, devServerPort) {
                 loader: 'postcss-loader',
                 options: {
                   plugins: [
-                    require('stylelint'),
                     require('postcss-discard-duplicates')
                   ]
                 }

diff --git a/server/zanata-frontend/src/yarn.lock b/server/zanata-frontend/src/yarn.lock
@@ -3297,6 +3297,10 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.2:
   dependencies:
     cssom "0.3.x"
 
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -8298,6 +8302,16 @@ postcss-unique-selectors@^2.0.2:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
+postcss-url@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120"
+  dependencies:
+    mime "^1.4.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^6.0.1"
+    xxhashjs "^0.2.1"
+
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
@@ -11706,6 +11720,12 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
+xxhashjs@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  dependencies:
+    cuint "^0.2.2"
+
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"