From f6667de9e0ad7c7c66d76e043dc787007df85eca Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 6 Sep 2018 18:55:57 -0600 Subject: [PATCH 01/10] add vertical spacing for markdown paragraphs --- src/renderer/scss/component/_markdown-preview.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/scss/component/_markdown-preview.scss b/src/renderer/scss/component/_markdown-preview.scss index 6322305ea..ac7896eae 100644 --- a/src/renderer/scss/component/_markdown-preview.scss +++ b/src/renderer/scss/component/_markdown-preview.scss @@ -39,6 +39,7 @@ /* Paragraphs */ p { + margin: $spacing-vertical 0; white-space: pre-line; } -- 2.45.3 From 83da37f09cd226316739d1afbf7265070316e098 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 6 Sep 2018 19:01:58 -0600 Subject: [PATCH 02/10] reduce margin size --- src/renderer/scss/component/_markdown-preview.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/scss/component/_markdown-preview.scss b/src/renderer/scss/component/_markdown-preview.scss index ac7896eae..085ff0b18 100644 --- a/src/renderer/scss/component/_markdown-preview.scss +++ b/src/renderer/scss/component/_markdown-preview.scss @@ -39,7 +39,7 @@ /* Paragraphs */ p { - margin: $spacing-vertical 0; + margin: $spacing-vertical * 2/3 0; white-space: pre-line; } -- 2.45.3 From 582ad19b6ea682c4d079a1ba778f37de8caffa8d Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 7 Sep 2018 09:55:37 -0400 Subject: [PATCH 03/10] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b83fc12..f8cd7391e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ 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)) ## [0.25.0] - 2018-08-29 -- 2.45.3 From 01380c9466213b027e0e6b6aeb4e29c4f0c11804 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 6 Sep 2018 22:04:03 -0600 Subject: [PATCH 04/10] align page-number input with pagination component on channel page --- src/renderer/scss/component/_pagination.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/renderer/scss/component/_pagination.scss b/src/renderer/scss/component/_pagination.scss index baec768e4..ab373f530 100644 --- a/src/renderer/scss/component/_pagination.scss +++ b/src/renderer/scss/component/_pagination.scss @@ -34,3 +34,11 @@ color: white; background: var(--color-primary); } + +.pagination + .form-field { + margin: 0 $spacing-width * 2/3; + + .form-field__input { + padding: 0; + } +} -- 2.45.3 From 2e9897a558c31f81f98199f515d465b249471bf1 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 7 Sep 2018 10:06:38 -0400 Subject: [PATCH 05/10] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8cd7391e..c1d06e880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### 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)) ## [0.25.0] - 2018-08-29 -- 2.45.3 From f34371a9555bf0bc71e44d1c7a6e81087c56d5f2 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 6 Sep 2018 23:24:54 -0600 Subject: [PATCH 06/10] fix table padding --- src/renderer/scss/component/_table.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/renderer/scss/component/_table.scss b/src/renderer/scss/component/_table.scss index c54f7d56a..f415280a7 100644 --- a/src/renderer/scss/component/_table.scss +++ b/src/renderer/scss/component/_table.scss @@ -15,26 +15,21 @@ table.table, padding-right: $spacing-vertical * 2/3; } - thead { - color: var(--text-color); - border-bottom: var(--table-border); - } - - th, - td { + tr th, + tr 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 0; + padding: $spacing-vertical * 1/3 $spacing-vertical * 1/3; .btn:not(.btn--link) { display: inline; @@ -50,6 +45,11 @@ 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); -- 2.45.3 From 61a2131878179ff81cf369652685d72b67a2f485 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 6 Sep 2018 23:45:05 -0600 Subject: [PATCH 07/10] revert top-bottom padding --- src/renderer/scss/component/_table.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/scss/component/_table.scss b/src/renderer/scss/component/_table.scss index f415280a7..c47120951 100644 --- a/src/renderer/scss/component/_table.scss +++ b/src/renderer/scss/component/_table.scss @@ -29,7 +29,7 @@ table.table, td { font-family: 'metropolis-medium'; color: var(--color-help); - padding: $spacing-vertical * 1/3 $spacing-vertical * 1/3; + padding: $spacing-vertical * 1/6 $spacing-vertical * 1/3; .btn:not(.btn--link) { display: inline; -- 2.45.3 From fcb08f83445c24cb324bf0224dd28c21a2b02004 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 7 Sep 2018 10:13:30 -0400 Subject: [PATCH 08/10] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d06e880..91545dfea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### 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 -- 2.45.3 From 780ef26e9b5c961bb0cb15637cbebfef75758b3a Mon Sep 17 00:00:00 2001 From: Jessop Breth Date: Fri, 7 Sep 2018 14:10:46 -0400 Subject: [PATCH 09/10] modalSendTip closes on esc/click outside --- src/renderer/modal/modalSendTip/view.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/modal/modalSendTip/view.jsx b/src/renderer/modal/modalSendTip/view.jsx index 6593d148d..b7e2e6839 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 ( - + ); -- 2.45.3 From db0b77504deb3ace980d8b406983d51bd94abe5b Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sat, 8 Sep 2018 12:44:15 -0400 Subject: [PATCH 10/10] set default path back to discover --- src/renderer/redux/reducers/navigation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = {}; -- 2.45.3