From b4866c40f177d89041c2072ac00219365d668c72 Mon Sep 17 00:00:00 2001 From: David Dreher Date: Sun, 17 Feb 2019 13:17:49 +0100 Subject: [PATCH 1/5] Use same styles for all preferences tabs --- .../modals/PreferencesModal/ConfigTab.styl | 8 ++++++++ .../modals/PreferencesModal/Crowdfunding.js | 8 +++----- .../modals/PreferencesModal/Crowdfunding.styl | 10 ++-------- .../main/modals/PreferencesModal/InfoTab.js | 7 +++---- .../main/modals/PreferencesModal/InfoTab.styl | 19 +------------------ .../modals/PreferencesModal/SnippetTab.js | 2 +- .../modals/PreferencesModal/SnippetTab.styl | 11 +---------- .../modals/PreferencesModal/StoragesTab.styl | 6 +----- 8 files changed, 20 insertions(+), 51 deletions(-) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index 255165ce7..a7e1c1f2b 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -18,6 +18,14 @@ margin-bottom 15px margin-top 30px +.group-header--sub + @extend .group-header + margin-bottom 10px + +.group-header2--sub + @extend .group-header2 + margin-bottom 10px + .group-section margin-bottom 20px display flex diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js index f94ee5caf..d7dacbb2a 100644 --- a/browser/main/modals/PreferencesModal/Crowdfunding.js +++ b/browser/main/modals/PreferencesModal/Crowdfunding.js @@ -22,18 +22,16 @@ class Crowdfunding extends React.Component { render () { return (
-
{i18n.__('Crowdfunding')}
+
{i18n.__('Crowdfunding')}

{i18n.__('Thank you for using Boostnote!')}


{i18n.__('We launched IssueHunt which is an issue-based crowdfunding / sourcing platform for open source projects.')}

{i18n.__('Anyone can put a bounty on not only a bug but also on OSS feature requests listed on IssueHunt. Collected funds will be distributed to project owners and contributors.')}

-
-

{i18n.__('### Sustainable Open Source Ecosystem')}

+
{i18n.__('### Sustainable Open Source Ecosystem')}

{i18n.__('We discussed about open-source ecosystem and IssueHunt concept with the Boostnote team repeatedly. We actually also discussed with Matz who father of Ruby.')}

{i18n.__('The original reason why we made IssueHunt was to reward our contributors of Boostnote project. We’ve got tons of Github stars and hundred of contributors in two years.')}

{i18n.__('We thought that it will be nice if we can pay reward for our contributors.')}

-
-

{i18n.__('### We believe Meritocracy')}

+
{i18n.__('### We believe Meritocracy')}

{i18n.__('We think developers who have skills and do great things must be rewarded properly.')}

{i18n.__('OSS projects are used in everywhere on the internet, but no matter how they great, most of owners of those projects need to have another job to sustain their living.')}

{i18n.__('It sometimes looks like exploitation.')}

diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.styl b/browser/main/modals/PreferencesModal/Crowdfunding.styl index 6d72290ba..d1d6fc9f5 100644 --- a/browser/main/modals/PreferencesModal/Crowdfunding.styl +++ b/browser/main/modals/PreferencesModal/Crowdfunding.styl @@ -1,14 +1,8 @@ -@import('./Tab') +@import('./ConfigTab') -.root - padding 15px - white-space pre - line-height 1.4 - color alpha($ui-text-color, 90%) - width 100% - font-size 14px p font-size 16px + line-height 1.4 .cf-link height 35px diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js index dafabb021..8682f62de 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.js +++ b/browser/main/modals/PreferencesModal/InfoTab.js @@ -69,8 +69,7 @@ class InfoTab extends React.Component { render () { return (
- -
{i18n.__('Community')}
+
{i18n.__('Community')}
  • @@ -108,7 +107,7 @@ class InfoTab extends React.Component {
    -
    {i18n.__('About')}
    +
    {i18n.__('About')}
    @@ -143,7 +142,7 @@ class InfoTab extends React.Component {
    -
    {i18n.__('Analytics')}
    +
    {i18n.__('Analytics')}
    {i18n.__('Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.')}
    {i18n.__('You can see how it works on ')} this.handleLinkClick(e)}>GitHub.

    diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl index 44f2d9ae5..25348afa8 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.styl +++ b/browser/main/modals/PreferencesModal/InfoTab.styl @@ -1,16 +1,4 @@ -@import('./Tab') - -.root - padding 15px - white-space pre - line-height 1.4 - color alpha($ui-text-color, 90%) - width 100% - font-size 14px - -.top - text-align left - margin-bottom 20px +@import('./ConfigTab.styl') .icon-space margin 20px 0 @@ -45,11 +33,6 @@ .separate-line margin 40px 0 -.policy - width 100% - font-size 20px - margin-bottom 10px - .policy-submit margin-top 10px diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js index 5f5b0aac7..df338d7f6 100644 --- a/browser/main/modals/PreferencesModal/SnippetTab.js +++ b/browser/main/modals/PreferencesModal/SnippetTab.js @@ -91,7 +91,7 @@ class SnippetTab extends React.Component { if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4 return (
    -
    {i18n.__('Snippets')}
    +
    {i18n.__('Snippets')}
    Date: Sun, 17 Feb 2019 13:23:19 +0100 Subject: [PATCH 2/5] Change paragraph headlines at the crowdfunding tab --- browser/main/modals/PreferencesModal/Crowdfunding.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js index d7dacbb2a..56bb6e34f 100644 --- a/browser/main/modals/PreferencesModal/Crowdfunding.js +++ b/browser/main/modals/PreferencesModal/Crowdfunding.js @@ -27,11 +27,11 @@ class Crowdfunding extends React.Component {

    {i18n.__('We launched IssueHunt which is an issue-based crowdfunding / sourcing platform for open source projects.')}

    {i18n.__('Anyone can put a bounty on not only a bug but also on OSS feature requests listed on IssueHunt. Collected funds will be distributed to project owners and contributors.')}

    -
    {i18n.__('### Sustainable Open Source Ecosystem')}
    +
    {i18n.__('Sustainable Open Source Ecosystem')}

    {i18n.__('We discussed about open-source ecosystem and IssueHunt concept with the Boostnote team repeatedly. We actually also discussed with Matz who father of Ruby.')}

    {i18n.__('The original reason why we made IssueHunt was to reward our contributors of Boostnote project. We’ve got tons of Github stars and hundred of contributors in two years.')}

    {i18n.__('We thought that it will be nice if we can pay reward for our contributors.')}

    -
    {i18n.__('### We believe Meritocracy')}
    +
    {i18n.__('We believe Meritocracy')}

    {i18n.__('We think developers who have skills and do great things must be rewarded properly.')}

    {i18n.__('OSS projects are used in everywhere on the internet, but no matter how they great, most of owners of those projects need to have another job to sustain their living.')}

    {i18n.__('It sometimes looks like exploitation.')}

    From 9466819d3cb3846c1892a0c331b0d1d61b6ac781 Mon Sep 17 00:00:00 2001 From: David Dreher Date: Fri, 22 Feb 2019 14:21:48 +0100 Subject: [PATCH 3/5] Replace the width calc with a fixed value --- browser/main/modals/PreferencesModal/SnippetTab.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/modals/PreferencesModal/SnippetTab.styl b/browser/main/modals/PreferencesModal/SnippetTab.styl index 656ebb15a..296f81674 100644 --- a/browser/main/modals/PreferencesModal/SnippetTab.styl +++ b/browser/main/modals/PreferencesModal/SnippetTab.styl @@ -118,7 +118,7 @@ background darken(#f5f5f5, 5) .snippet-detail - width calc(100% - 33%) + width 67% height calc(100% - 200px) position absolute left 33% From c243f5573703417ffb25ce10603e59e5342b811c Mon Sep 17 00:00:00 2001 From: David Dreher Date: Fri, 1 Mar 2019 07:24:19 +0100 Subject: [PATCH 4/5] change missing font color for the themes at the preferences headlines --- browser/main/modals/PreferencesModal/ConfigTab.styl | 8 ++++++++ browser/main/modals/PreferencesModal/InfoTab.styl | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index a7e1c1f2b..0e22833d9 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -156,10 +156,12 @@ body[data-theme="dark"] color $ui-dark-text-color .group-header + .group-header--sub color $ui-dark-text-color border-color $ui-dark-borderColor .group-header2 + .group-header2--sub color $ui-dark-text-color .group-section-control-input @@ -184,10 +186,12 @@ body[data-theme="solarized-dark"] color $ui-solarized-dark-text-color .group-header + .group-header--sub color $ui-solarized-dark-text-color border-color $ui-solarized-dark-borderColor .group-header2 + .group-header2--sub color $ui-solarized-dark-text-color .group-section-control-input @@ -211,10 +215,12 @@ body[data-theme="monokai"] color $ui-monokai-text-color .group-header + .group-header--sub color $ui-monokai-text-color border-color $ui-monokai-borderColor .group-header2 + .group-header2--sub color $ui-monokai-text-color .group-section-control-input @@ -238,10 +244,12 @@ body[data-theme="dracula"] color $ui-dracula-text-color .group-header + .group-header--sub color $ui-dracula-text-color border-color $ui-dracula-borderColor .group-header2 + .group-header2--sub color $ui-dracula-text-color .group-section-control-input diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl index 25348afa8..713647d3d 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.styl +++ b/browser/main/modals/PreferencesModal/InfoTab.styl @@ -40,14 +40,18 @@ margin-top 10px font-size 12px + body[data-theme="dark"] .root color alpha($tab--dark-text-color, 80%) - + .appId + color $ui-dark-text-color body[data-theme="solarized-dark"] .root color $ui-solarized-dark-text-color + .appId + color $ui-solarized-dark-text-color .list a color $ui-solarized-dark-active-color @@ -55,6 +59,8 @@ body[data-theme="solarized-dark"] body[data-theme="monokai"] .root color $ui-monokai-text-color + .appId + color $ui-monokai-text-color .list a color $ui-monokai-active-color @@ -62,6 +68,8 @@ body[data-theme="monokai"] body[data-theme="dracula"] .root color $ui-dracula-text-color + .appId + color $ui-dracula-text-color .list a - color $ui-dracula-active-color + color $ui-dracula-active-color \ No newline at end of file From c1d95e27e167201aea6a0bbf3b3d458b2fc8b9d5 Mon Sep 17 00:00:00 2001 From: David Dreher Date: Fri, 1 Mar 2019 07:31:22 +0100 Subject: [PATCH 5/5] Change the save botton at the about tab to the same style as the 'See IssueHunt' button at the crowdfunding tab --- browser/main/modals/PreferencesModal/InfoTab.styl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl index 713647d3d..c541c91ca 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.styl +++ b/browser/main/modals/PreferencesModal/InfoTab.styl @@ -35,12 +35,24 @@ .policy-submit margin-top 10px + height 35px + border-radius 2px + border none + background-color alpha(#1EC38B, 90%) + padding-left 20px + padding-right 20px + text-decoration none + color white + font-weight 600 + font-size 16px + &:hover + background-color #1EC38B + transition 0.2s .policy-confirm margin-top 10px font-size 12px - body[data-theme="dark"] .root color alpha($tab--dark-text-color, 80%)