From efeb5b667294cebb3448e55d51edb8454b7f57ae Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 7 May 2019 21:29:30 -0400 Subject: [PATCH 1/5] style consitency cleanup round is back! --- src/ui/component/channelContent/view.jsx | 1 - src/ui/component/common/paginate.jsx | 11 +++--- src/ui/component/navigationHistory/view.jsx | 6 ++-- .../navigationHistoryRecent/view.jsx | 2 +- src/ui/component/publishForm/view.jsx | 29 +++++++-------- .../internal/transaction-list-item.jsx | 3 +- src/ui/component/transactionList/view.jsx | 3 +- .../component/transactionListRecent/view.jsx | 5 --- src/ui/component/userVerify/view.jsx | 2 +- src/ui/component/walletBalance/view.jsx | 2 +- src/ui/page/settings/view.jsx | 23 ++++++------ src/ui/page/show/view.jsx | 4 +-- src/ui/scss/component/_button.scss | 13 ------- src/ui/scss/component/_card.scss | 13 +++++-- src/ui/scss/component/_form-field.scss | 35 ++++++++++++++++--- src/ui/scss/component/_markdown-editor.scss | 6 ++-- src/ui/scss/component/_media.scss | 14 +++----- src/ui/scss/component/_placeholder.scss | 11 ------ src/ui/scss/component/_search.scss | 6 +--- src/ui/scss/component/_table.scss | 18 +++------- src/ui/scss/init/_gui.scss | 5 +-- src/ui/scss/init/_mixins.scss | 13 +++++++ src/ui/scss/init/_vars.scss | 3 +- 23 files changed, 112 insertions(+), 116 deletions(-) diff --git a/src/ui/component/channelContent/view.jsx b/src/ui/component/channelContent/view.jsx index 83cc3378a..3f129b45a 100644 --- a/src/ui/component/channelContent/view.jsx +++ b/src/ui/component/channelContent/view.jsx @@ -14,7 +14,6 @@ type Props = { claimsInChannel: Array, channelIsMine: boolean, fetchClaims: (string, number) => void, - location: UrlLocation, }; function ChannelContent(props: Props) { diff --git a/src/ui/component/common/paginate.jsx b/src/ui/component/common/paginate.jsx index 7c4635a03..c775ba821 100644 --- a/src/ui/component/common/paginate.jsx +++ b/src/ui/component/common/paginate.jsx @@ -40,12 +40,13 @@ function Paginate(props: Props) { } } - if (totalPages <= 1 || loading) { - return null; - } - return ( -
+ // Hide the paginate controls if we are loading or there is only one page + // This is a little weird but it makes the component + // really nice to work with. It will always handle fetching your data, + // even if the data returned doesn't have more than one page + // fetchStuff(page)} /> + { )} diff --git a/src/ui/component/transactionList/view.jsx b/src/ui/component/transactionList/view.jsx index 05dc7adb3..ae9d63b52 100644 --- a/src/ui/component/transactionList/view.jsx +++ b/src/ui/component/transactionList/view.jsx @@ -2,7 +2,6 @@ import * as icons from 'constants/icons'; import * as MODALS from 'constants/modal_types'; import * as React from 'react'; -import { List } from 'react-virtualized'; import { FormField, Form } from 'component/common/form'; import Button from 'component/button'; import FileExporter from 'component/common/file-exporter'; @@ -103,7 +102,7 @@ class TransactionList extends React.PureComponent { )} - {!transactionList.length &&

{emptyMessage || __('No transactions to list.')}

} + {!transactionList.length &&

{emptyMessage || __('No transactions to list.')}

} {!!transactionList.length && ( diff --git a/src/ui/component/transactionListRecent/view.jsx b/src/ui/component/transactionListRecent/view.jsx index 28e27dc83..da6578aa2 100644 --- a/src/ui/component/transactionListRecent/view.jsx +++ b/src/ui/component/transactionListRecent/view.jsx @@ -31,11 +31,6 @@ class TransactionListRecent extends React.PureComponent { {__('Recent Transactions')} - -

- {__('To view all of your transactions, navigate to the')}{' '} -