LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

so much discovery I can't take it #2617

Merged
neb-b merged 20 commits from fixes into master 2019-07-23 01:45:30 +02:00
Conversation 1 Commits 20 Files changed 47 +25 -14
4 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7102f06b82 - Show all commits

18
src/ui/page/settings/view.jsx
View file

@ -173,16 +173,14 @@ class SettingsPage extends React.PureComponent<Props, State> {
</header> </header>
<div className="card__content"> <div className="card__content">
<Form> <FileSelector
<FileSelector type="openDirectory"
type="openDirectory" currentPath={daemonSettings.download_dir}
currentPath={daemonSettings.download_dir} onFileChosen={(newDirectory: string) => {
onFileChosen={(newDirectory: string) => { setDaemonSetting('download_dir', newDirectory);
setDaemonSetting('download_dir', newDirectory); }}
}} />
/> <p className="help">{__('LBRY downloads will be saved here.')}</p>
<p className="help">{__('LBRY downloads will be saved here.')}</p>
</Form>
</div> </div>
</section> </section>

3
src/ui/scss/component/_button.scss
View file

@ -44,8 +44,7 @@
line-height: var(--button-height); line-height: var(--button-height);
border-radius: var(--button-radius); border-radius: var(--button-radius);
font-size: 1.1rem; font-size: 1.1rem;
padding-top: 0; padding: 0 var(--spacing-medium);
padding-bottom: 0;
box-sizing: border-box; box-sizing: border-box;
} }

16
src/ui/scss/component/_form-field.scss
View file

@ -1,5 +1,16 @@
@import '~@lbry/components/sass/form/_index.scss'; @import '~@lbry/components/sass/form/_index.scss';
// Reset lbry components style that turns buttons inside of forms black
form {
.button--primary,
[type='submit'] {
&:not(:hover),
&:hover {
@extend .button--primary;
}
}
}
textarea { textarea {
&::placeholder { &::placeholder {
opacity: 0.4; opacity: 0.4;
@ -223,7 +234,10 @@ fieldset-section {
} }
} }
.button { .button,
// specificity needed because of @lbry/component rules
// @lbry/componentfixme
.button[type='submit']:not(:hover) {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-top-right-radius: var(--input-border-radius); border-top-right-radius: var(--input-border-radius);

2
static/locales/en.json
View file

@ -576,4 +576,4 @@
"Are you sure you want to remove this support?": "Are you sure you want to remove this support?", "Are you sure you want to remove this support?": "Are you sure you want to remove this support?",
"These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.": "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.", "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.": "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.",
"The better your tags are, the easier it will be for people to discover your channel.": "The better your tags are, the easier it will be for people to discover your channel." "The better your tags are, the easier it will be for people to discover your channel.": "The better your tags are, the easier it will be for people to discover your channel."
} }