Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions browser/main/modals/PreferencesModal/ConfigTab.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions browser/main/modals/PreferencesModal/Crowdfunding.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,16 @@ class Crowdfunding extends React.Component {
render () {
return (
<div styleName='root'>
<div styleName='header'>{i18n.__('Crowdfunding')}</div>
<div styleName='group-header'>{i18n.__('Crowdfunding')}</div>
<p>{i18n.__('Thank you for using Boostnote!')}</p>
<br />
<p>{i18n.__('We launched IssueHunt which is an issue-based crowdfunding / sourcing platform for open source projects.')}</p>
<p>{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.')}</p>
<br />
<p>{i18n.__('### Sustainable Open Source Ecosystem')}</p>
<div styleName='group-header2--sub'>{i18n.__('Sustainable Open Source Ecosystem')}</div>
<p>{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.')}</p>
<p>{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.')}</p>
<p>{i18n.__('We thought that it will be nice if we can pay reward for our contributors.')}</p>
<br />
<p>{i18n.__('### We believe Meritocracy')}</p>
<div styleName='group-header2--sub'>{i18n.__('We believe Meritocracy')}</div>
<p>{i18n.__('We think developers who have skills and do great things must be rewarded properly.')}</p>
<p>{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.')}</p>
<p>{i18n.__('It sometimes looks like exploitation.')}</p>
Expand Down
10 changes: 2 additions & 8 deletions browser/main/modals/PreferencesModal/Crowdfunding.styl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions browser/main/modals/PreferencesModal/InfoTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ class InfoTab extends React.Component {
render () {
return (
<div styleName='root'>

<div styleName='header--sub'>{i18n.__('Community')}</div>
<div styleName='group-header'>{i18n.__('Community')}</div>
<div styleName='top'>
<ul styleName='list'>
<li>
Expand Down Expand Up @@ -108,7 +107,7 @@ class InfoTab extends React.Component {

<hr />

<div styleName='header--sub'>{i18n.__('About')}</div>
<div styleName='group-header--sub'>{i18n.__('About')}</div>

<div styleName='top'>
<div styleName='icon-space'>
Expand Down Expand Up @@ -143,7 +142,7 @@ class InfoTab extends React.Component {

<hr styleName='separate-line' />

<div styleName='policy'>{i18n.__('Analytics')}</div>
<div styleName='group-header2--sub'>{i18n.__('Analytics')}</div>
<div>{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.')}</div>
<div>{i18n.__('You can see how it works on ')}<a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div>
<br />
Expand Down
19 changes: 1 addition & 18 deletions browser/main/modals/PreferencesModal/InfoTab.styl
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -45,11 +33,6 @@
.separate-line
margin 40px 0

.policy
width 100%
font-size 20px
margin-bottom 10px

.policy-submit
margin-top 10px

Expand Down
2 changes: 1 addition & 1 deletion browser/main/modals/PreferencesModal/SnippetTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class SnippetTab extends React.Component {
if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
return (
<div styleName='root'>
<div styleName='header'>{i18n.__('Snippets')}</div>
<div styleName='group-header'>{i18n.__('Snippets')}</div>
<SnippetList
onSnippetSelect={this.handleSnippetSelect.bind(this)}
onSnippetDeleted={this.handleDeleteSnippet.bind(this)}
Expand Down
11 changes: 1 addition & 10 deletions browser/main/modals/PreferencesModal/SnippetTab.styl
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
@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

.group
margin-bottom 45px

Expand Down Expand Up @@ -127,7 +118,7 @@
background darken(#f5f5f5, 5)

.snippet-detail
width 70%
width 67%
height calc(100% - 200px)
position absolute
left 33%
Expand Down
6 changes: 1 addition & 5 deletions browser/main/modals/PreferencesModal/StoragesTab.styl
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import('./Tab')

.root
padding 15px
color $ui-text-color
@import('./ConfigTab')

.list
margin-bottom 15px
Expand Down