From 174bfbc8fb4b7891efb95482bb9c3e4c4283e6c5 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 14 Jan 2019 13:40:06 -0500 Subject: [PATCH] 0.27.0 cleanup (#2182) * fix: channel navigation from suggested subscriptions * fix: move subscribe/share buttons below name on channel page * fix: images with weird media type * fix: increase tx amount size on tx table * change: add icons to nav bar * fix: move filewatcher-webpack-plugin into dev dependencies * fix: upgrade button styling * improvement: modal consistency * change: increase svg stroke inside button * fix: more descriptive title on header for wallet balance * fix: minor color/alignment * chore: update lbry-redux --- .eslintrc.json | 16 +++--- package.json | 4 +- src/renderer/component/categoryList/view.jsx | 2 +- .../component/common/credit-amount.jsx | 2 +- src/renderer/component/copyableText/view.jsx | 4 +- src/renderer/component/fileTile/view.jsx | 16 +++--- src/renderer/component/header/view.jsx | 21 ++++---- src/renderer/component/sideBar/view.jsx | 44 +++++++++-------- src/renderer/component/socialShare/view.jsx | 8 +-- src/renderer/component/userPhoneNew/view.jsx | 15 +++--- .../component/userPhoneVerify/view.jsx | 9 ++-- src/renderer/component/walletSendTip/view.jsx | 2 +- src/renderer/constants/icons.js | 1 + src/renderer/index.js | 4 +- src/renderer/modal/modal.jsx | 6 +-- .../modal/modalAffirmPurchase/view.jsx | 16 +++--- .../modalConfirmThumbnailUpload/view.jsx | 30 ++++++------ src/renderer/modal/modalCreditIntro/view.jsx | 20 ++++---- src/renderer/modal/modalDownloading/view.jsx | 23 +++------ src/renderer/modal/modalError/view.jsx | 1 - src/renderer/modal/modalFileTimeout/view.jsx | 6 ++- src/renderer/modal/modalFirstReward/view.jsx | 1 - .../modal/modalPhoneCollection/view.jsx | 11 ++++- src/renderer/modal/modalRemoveFile/view.jsx | 10 ++-- src/renderer/modal/modalRevokeClaim/view.jsx | 5 -- src/renderer/modal/modalRewardCode/view.jsx | 22 ++++----- .../modal/modalTransactionFailed/view.jsx | 6 ++- .../modal/modalWalletDecrypt/view.jsx | 25 ++++------ .../modal/modalWalletEncrypt/view.jsx | 27 +++++----- src/renderer/modal/modalWalletUnlock/view.jsx | 17 +++---- src/renderer/modal/modalWelcome/view.jsx | 13 +++-- src/renderer/page/channel/view.jsx | 24 +++++---- src/renderer/page/file/view.jsx | 2 +- src/renderer/redux/selectors/app.js | 2 +- src/renderer/scss/component/_button.scss | 13 ++++- src/renderer/scss/component/_channel.scss | 11 +++-- src/renderer/scss/component/_content.scss | 17 ++++++- src/renderer/scss/component/_header.scss | 49 ++++++++++--------- src/renderer/scss/component/_media.scss | 2 +- src/renderer/scss/component/_modal.scss | 27 +--------- src/renderer/scss/component/_navigation.scss | 5 +- src/renderer/scss/component/_table.scss | 3 ++ yarn.lock | 8 +-- 43 files changed, 274 insertions(+), 276 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 22a808553..a21517c96 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -28,11 +28,14 @@ "rules": { "import/no-commonjs": "warn", "import/no-amd": "warn", - "prettier/prettier": ["error", { - "trailingComma": "es5", - "printWidth": 100, - "singleQuote": true - }], + "prettier/prettier": [ + "error", + { + "trailingComma": "es5", + "printWidth": 100, + "singleQuote": true + } + ], "func-names": ["warn", "as-needed"], "jsx-a11y/label-has-for": 0, "import/prefer-default-export": 0, @@ -45,6 +48,7 @@ "jsx-a11y/click-events-have-key-events": 0, "consistent-return": 0, "no-prototype-builtins": 0, - "flowtype/space-after-type-colon": [ 2, "always", { "allowLineBreak": true } ] + "flowtype/space-after-type-colon": [2, "always", { "allowLineBreak": true }], + "no-restricted-syntax": 0 } } diff --git a/package.json b/package.json index 2ca9439d9..92a4a10f6 100644 --- a/package.json +++ b/package.json @@ -46,12 +46,11 @@ "electron-log": "^2.2.12", "electron-updater": "^2.23.3", "electron-window-state": "^4.1.1", - "filewatcher-webpack-plugin": "^1.2.0", "find-process": "^1.1.0", "formik": "^0.10.4", "hast-util-sanitize": "^1.1.2", "keytar": "^4.2.1", - "lbry-redux": "lbryio/lbry-redux#820b6eeadf9e58c1e5027fd4d92808ba817b410e", + "lbry-redux": "lbryio/lbry-redux#a22f8284110f957f3f645d42abc457ab8fb3fa8a", "lbryinc": "lbryio/lbryinc#b3bb8c67745235ef54baea95accaedaa4bb86d4d", "localforage": "^1.7.1", "mammoth": "^1.4.6", @@ -115,6 +114,7 @@ "eslint-plugin-jsx-a11y": "^6.0.3", "eslint-plugin-prettier": "^2.6.0", "eslint-plugin-react": "^7.7.0", + "filewatcher-webpack-plugin": "^1.2.0", "flow-bin": "^0.89.0", "flow-typed": "^2.3.0", "husky": "^0.14.3", diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx index 559bdcaf8..1e489e282 100644 --- a/src/renderer/component/categoryList/view.jsx +++ b/src/renderer/component/categoryList/view.jsx @@ -227,7 +227,7 @@ class CategoryList extends PureComponent {