diff --git a/js/component/menu.js b/js/component/menu.js index 44c3adec8..c1b9ac105 100644 --- a/js/component/menu.js +++ b/js/component/menu.js @@ -1,8 +1,6 @@ // Generic menu styles var menuStyle = { - border: '1px solid #aaa', - padding: '4px', - whiteSpace: 'nowrap', + whiteSpace: 'nowrap' }; var Menu = React.createClass({ diff --git a/js/page/my_files.js b/js/page/my_files.js index e962cf9d9..c368cda48 100644 --- a/js/page/my_files.js +++ b/js/page/my_files.js @@ -24,9 +24,11 @@ var MyFilesRowMoreMenu = React.createClass({ return (
- {/* @TODO: Switch to OS specific wording */} - - +
+ {/* @TODO: Switch to OS specific wording */} + + +
); @@ -92,35 +94,37 @@ var MyFilesRow = React.createClass({ } return ( -
-
- {this.props.imgUrl ? {'Photo : null} -
-
-

{this.props.pending ? this.props.title : {this.props.title}}

- {this.props.pending ? This file is pending confirmation - : ( -
-
- { ' ' } - {this.props.completed ? 'Download complete' : (parseInt(this.props.ratioLoaded * 100) + '%')} -
{ pauseLink }
-
{ watchButton }
+
+
+
+ {this.props.imgUrl ? {'Photo : null} +
+
+

{this.props.pending ? this.props.title : {this.props.title}}

+ {this.props.pending ? This file is pending confirmation + : ( +
+
+ { ' ' } + {this.props.completed ? 'Download complete' : (parseInt(this.props.ratioLoaded * 100) + '%')} +
{ pauseLink }
+
{ watchButton }
+
+ ) + } +
+
+ {this.props.pending ? null : +
+ +
- ) - } + } +
-
- {this.props.pending ? null : -
- - -
- } -
-
+ ); } }); @@ -195,9 +199,7 @@ var MyFilesPage = React.createClass({ } return (
-
- {content} -
+ {content}
); } diff --git a/js/page/publish.js b/js/page/publish.js index 60a6a7184..5a155e601 100644 --- a/js/page/publish.js +++ b/js/page/publish.js @@ -263,20 +263,22 @@ var PublishPage = React.createClass({ }, render: function() { return ( -
-
+
+

LBRY Name

- lbry:// - { - (!this.state.name ? '' : - (! this.state.nameResolved ? This name is available - : (this.state.nameIsMine ? You already control this name. You can use this page to update your claim. - : This name is currently claimed for {lbry.formatCredits(this.state.claimValue)} credits.))) - } -
What LBRY name would you like to claim for this file?
+
+ lbry:// + { + (!this.state.name ? '' : + (! this.state.nameResolved ? This name is available + : (this.state.nameIsMine ? You already control this name. You can use this page to update your claim. + : This name is currently claimed for {lbry.formatCredits(this.state.claimValue)} credits.))) + } +
What LBRY name would you like to claim for this file?
+
-
+

Choose File

@@ -290,19 +292,21 @@ var PublishPage = React.createClass({ { this.state.nameIsMine ?
If you don't choose a file, the file from your existing claim will be used.
: null }
-
+

Bid Amount

- Credits -
How much would you like to bid for this name? - { !this.state.nameResolved ? Since this name is not currently resolved, you may bid as low as you want, but higher bids help prevent others from claiming your name. - : (this.state.nameIsMine ? Your current bid is {lbry.formatCredits(this.state.claimValue)} credits. - : You must bid over {lbry.formatCredits(this.state.claimValue)} credits to claim this name.) } +
+ Credits +
How much would you like to bid for this name? + { !this.state.nameResolved ? Since this name is not currently resolved, you may bid as low as you want, but higher bids help prevent others from claiming your name. + : (this.state.nameIsMine ? Your current bid is {lbry.formatCredits(this.state.claimValue)} credits. + : You must bid over {lbry.formatCredits(this.state.claimValue)} credits to claim this name.) } +
-
+

Fee

-
+
@@ -315,20 +319,27 @@ var PublishPage = React.createClass({ -
-
-

How much would you like to charge for this file?

- If you choose to price this content in dollars, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase. +
+

How much would you like to charge for this file?

+ If you choose to price this content in dollars, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase. +
-
+

Your Content

- - +
+ +
+
+ +
+
+
+
@@ -338,24 +349,30 @@ var PublishPage = React.createClass({ - - - -
+
+
+ +
+
+ +
-
+

Additional Content Information (Optional)

- - +
+ +
+
+ +
-
- - { ' ' } +
+
); diff --git a/js/page/settings.js b/js/page/settings.js index d7d89e32c..44fb795c5 100644 --- a/js/page/settings.js +++ b/js/page/settings.js @@ -90,22 +90,26 @@ var SettingsPage = React.createClass({

Bandwidth Limits

-

Max Upload

- - -

Max Download

- - +
+

Max Upload

+ + +
+
+

Max Download

+ + +

Share Diagnostic Data

diff --git a/js/page/wallet.js b/js/page/wallet.js index 286381b3d..cb74393b1 100644 --- a/js/page/wallet.js +++ b/js/page/wallet.js @@ -82,19 +82,24 @@ var SendToAddressSection = React.createClass({ return (

Send Credits

-
+
+
+
+
+
0.0) || this.state.address == ""} /> -
+
{ this.state.results ? -
+

Results

{this.state.results} -
+
: '' } + ); } }); diff --git a/scss/_canvas.scss b/scss/_canvas.scss index 6c15ca4f0..4b21f4b55 100644 --- a/scss/_canvas.scss +++ b/scss/_canvas.scss @@ -148,7 +148,14 @@ $header-icon-size: 1.5em; background: $color-bg; box-shadow: $default-box-shadow; border-radius: 2px; +} +.card-series-submit +{ + margin-left: auto; + margin-right: auto; + max-width: 800px; + padding: $spacing-vertical / 2; } .full-screen diff --git a/scss/_gui.scss b/scss/_gui.scss index 135ea5a16..a11702739 100644 --- a/scss/_gui.scss +++ b/scss/_gui.scss @@ -19,13 +19,6 @@ section } } -.section-block { - background-color: rgba(0,0,0,.05); - padding: $spacing-vertical; - border-radius: 2px; - margin-bottom: $spacing-vertical; -} - main h1 { font-size: 2.0em; margin-bottom: $spacing-vertical; @@ -78,17 +71,7 @@ textarea { opacity: 0.7; } -input[type="search"] -{ - border: 0 none; - border: 2px solid rgba(160,160,160,.5); - padding-left: 5px; - padding-right: 5px; - line-height: $spacing-vertical * 1.5; - margin-bottom: $spacing-vertical/2; -} - -input[type="text"], textarea +input[type="text"], input[type="search"], textarea { @include placeholder { color: lighten($color-text-dark, 60%); @@ -97,12 +80,9 @@ input[type="text"], textarea border: 2px solid rgba(160,160,160,.5); padding-left: 5px; padding-right: 5px; - line-height: $spacing-vertical; - margin-bottom: $spacing-vertical/2; -} - -select { - margin-bottom: $spacing-vertical/2; + height: $spacing-vertical * 1.5; + line-height: $spacing-vertical - 4; + box-sizing: border-box; } .busy-indicator @@ -135,7 +115,6 @@ select { border: 0 none; text-align: center; border-radius: 2px; - box-shadow: $default-box-shadow; text-transform: uppercase; + .button-block { @@ -159,11 +138,12 @@ select { { color: white; background-color: $color-primary; - + box-shadow: $default-box-shadow; } .button-alt { background-color: rgba(0,0,0,.15); + box-shadow: $default-box-shadow; } .button-text { @@ -195,28 +175,24 @@ select { } } -.footer-buttons { - display: flex; - justify-content: center; -} - .icon:only-child { position: relative; top: 0.16em; } -.fade-in-link { - - &:hover { - opacity: 1; - } -} - .help { font-size: .85em; color: $color-help; } -.spacer-bottom--sm { - margin-bottom: $spacing-vertical/2; +.form-row +{ + + .form-row + { + margin-top: $spacing-vertical / 2; + } + .help + { + margin-top: $spacing-vertical / 2; + } } \ No newline at end of file