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

update fonts and fix button font size

Browse source
This commit is contained in:
btzr-io 2017-10-02 22:08:25 -06:00
parent 59778808e3
commit fd99676307
7 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/dist/index.html vendored
View file

@ -3,8 +3,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title>LBRY</title> <title>LBRY</title>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600italic,600' rel='stylesheet' type='text/css'>
<link href="./css/all.css" rel="stylesheet" type="text/css" media="screen,print" /> <link href="./css/all.css" rel="stylesheet" type="text/css" media="screen,print" />
<link rel="icon" type="image/png" href="./img/fav/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="./img/fav/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="./img/fav/favicon-194x194.png" sizes="194x194"> <link rel="icon" type="image/png" href="./img/fav/favicon-194x194.png" sizes="194x194">

10
ui/js/component/file-selector.js
View file

@ -55,9 +55,13 @@ class FileSelector extends React.PureComponent {
className="button-block button-alt file-selector__choose-button" className="button-block button-alt file-selector__choose-button"
onClick={() => this.handleButtonClick()} onClick={() => this.handleButtonClick()}
> >
{this.props.type == "file" <span className="button__content">
? __("Choose File") <span className="button-label">
: __("Choose Directory")} {this.props.type == "file"
? __("Choose File")
: __("Choose Directory")}
</span>
</span>
</button> </button>
{" "} {" "}
<span className="file-selector__path"> <span className="file-selector__path">

4
ui/scss/_gui.scss
View file

@ -7,7 +7,7 @@ html
body body
{ {
color: var(--text-color); color: var(--text-color);
font-family: 'Source Sans Pro', sans-serif; font-family: 'Roboto', sans-serif;
line-height: var(--font-line-height); line-height: var(--font-line-height);
} }
@ -25,7 +25,7 @@ body
.credit-amount--indicator .credit-amount--indicator
{ {
font-weight: bold; font-weight: 500;
color: var(--color-money); color: var(--color-money);
} }
.credit-amount--fee .credit-amount--fee

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

@ -43,6 +43,8 @@ $button-focus-shift: 12%;
.button-block .button-block
{ {
cursor: pointer; cursor: pointer;
font-weight: 500;
font-size: 14px;
transition: background var(--animation-duration) var(--animation-style); transition: background var(--animation-duration) var(--animation-style);
} }
@ -94,6 +96,5 @@ $button-focus-shift: 12%;
.button--submit { .button--submit {
font-family: inherit; font-family: inherit;
font-size: inherit;
line-height: 0; line-height: 0;
} }

3
ui/scss/component/_card.scss
View file

@ -54,6 +54,7 @@
.card__actions--bottom { .card__actions--bottom {
margin-top: $spacing-vertical * 1/3; margin-top: $spacing-vertical * 1/3;
margin-bottom: $spacing-vertical * 1/3; margin-bottom: $spacing-vertical * 1/3;
border-top: var(--divider);
} }
.card__actions--form-submit { .card__actions--form-submit {
margin-top: $spacing-vertical; margin-top: $spacing-vertical;
@ -288,4 +289,4 @@ if we keep doing things like this, we should add a real grid system, but I'm goi
> .card:nth-of-type(2n - 1):not(:last-child) { > .card:nth-of-type(2n - 1):not(:last-child) {
margin-right: $margin-card-grid; margin-right: $margin-card-grid;
} }
} }

3
ui/scss/component/_file-selector.scss
View file

@ -4,8 +4,9 @@
.file-selector__choose-button { .file-selector__choose-button {
font-family: inherit; font-family: inherit;
line-height: 0;
color: inherit;
margin-right: 16px; margin-right: 16px;
padding: 0 16px;
} }
.file-selector__path { .file-selector__path {

2
ui/scss/component/_tabs.scss
View file

@ -11,7 +11,7 @@ nav.sub-header
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
text-align: center; text-align: center;
font-weight: 600; font-weight: 500;
text-transform: uppercase; text-transform: uppercase;
display: inline-block; display: inline-block;
vertical-align: baseline; vertical-align: baseline;