diff --git a/CHANGELOG.md b/CHANGELOG.md index 91545dfea..d8b83fc12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Changed ### Fixed - * Paragraph rendering now properly includes a margin for new paragraphs ([#1939](https://github.com/lbryio/lbry-desktop/pull/1939)) - * Alignment of "navigate to page" input next to pagination on channel pages ([#1941](https://github.com/lbryio/lbry-desktop/pull/1941)) - * Table spacing with claim name in transactions table ([#1942](https://github.com/lbryio/lbry-desktop/pull/1942)) ## [0.25.0] - 2018-08-29 diff --git a/src/renderer/modal/modalSendTip/view.jsx b/src/renderer/modal/modalSendTip/view.jsx index b7e2e6839..6593d148d 100644 --- a/src/renderer/modal/modalSendTip/view.jsx +++ b/src/renderer/modal/modalSendTip/view.jsx @@ -13,7 +13,7 @@ class ModalSendTip extends React.PureComponent { const { closeModal, uri } = this.props; return ( - + ); diff --git a/src/renderer/redux/reducers/navigation.js b/src/renderer/redux/reducers/navigation.js index 13172f4b2..e4544b4cc 100644 --- a/src/renderer/redux/reducers/navigation.js +++ b/src/renderer/redux/reducers/navigation.js @@ -3,7 +3,7 @@ import * as ACTIONS from 'constants/action_types'; const getCurrentPath = () => { const { hash } = document.location; if (hash !== '') return hash.replace(/^#/, ''); - return '/user_history'; + return '/discover'; }; const reducers = {}; diff --git a/src/renderer/scss/component/_markdown-preview.scss b/src/renderer/scss/component/_markdown-preview.scss index 085ff0b18..6322305ea 100644 --- a/src/renderer/scss/component/_markdown-preview.scss +++ b/src/renderer/scss/component/_markdown-preview.scss @@ -39,7 +39,6 @@ /* Paragraphs */ p { - margin: $spacing-vertical * 2/3 0; white-space: pre-line; } diff --git a/src/renderer/scss/component/_pagination.scss b/src/renderer/scss/component/_pagination.scss index ab373f530..baec768e4 100644 --- a/src/renderer/scss/component/_pagination.scss +++ b/src/renderer/scss/component/_pagination.scss @@ -34,11 +34,3 @@ color: white; background: var(--color-primary); } - -.pagination + .form-field { - margin: 0 $spacing-width * 2/3; - - .form-field__input { - padding: 0; - } -} diff --git a/src/renderer/scss/component/_table.scss b/src/renderer/scss/component/_table.scss index c47120951..c54f7d56a 100644 --- a/src/renderer/scss/component/_table.scss +++ b/src/renderer/scss/component/_table.scss @@ -15,21 +15,26 @@ table.table, padding-right: $spacing-vertical * 2/3; } - tr th, - tr td { + thead { + color: var(--text-color); + border-bottom: var(--table-border); + } + + th, + td { font-size: 13px; + padding: 8px 0; } th { font-family: 'metropolis-semibold'; border: 0; - padding: $spacing-vertical * 2/3 $spacing-vertical * 1/3; } td { font-family: 'metropolis-medium'; color: var(--color-help); - padding: $spacing-vertical * 1/6 $spacing-vertical * 1/3; + padding: $spacing-vertical * 1/6 0; .btn:not(.btn--link) { display: inline; @@ -45,11 +50,6 @@ table.table, padding-left: $spacing-vertical * 1/3; } - thead { - color: var(--text-color); - border-bottom: var(--table-border); - } - tbody { tr { border-bottom: var(--table-item-border);