ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

style tweaks

Browse Source
This commit is contained in:
ddejongh 2015-06-22 18:02:04 +02:00
parent 9e1a76a08e
commit 02f8193743
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/components/ascribe_forms/form.js
View File

@ -102,10 +102,12 @@ let Form = React.createClass({
if (this.state.edited){ if (this.state.edited){
buttons = ( buttons = (
<p className="pull-right"> <div className="row" style={{margin: 0}}>
<Button className="ascribe-btn" type="submit">Save</Button> <p className="pull-right">
<Button className="ascribe-btn" onClick={this.reset}>Cancel</Button> <Button className="ascribe-btn" type="submit">Save</Button>
</p> <Button className="ascribe-btn" onClick={this.reset}>Cancel</Button>
</p>
</div>
); );
} }

20
js/components/settings_container.js
View File

@ -133,19 +133,13 @@ let BitcoinWalletSettings = React.createClass({
name='btc_public_key' name='btc_public_key'
label="Bitcoin public key" label="Bitcoin public key"
editable={false}> editable={false}>
<input <pre className="ascribe-pre">{this.state.walletSettings.btc_public_key}</pre>
type="text"
defaultValue={this.state.walletSettings.btc_public_key}
placeholder="Enter your username"
required/>
</Property> </Property>
<Property <Property
name='btc_root_address' name='btc_root_address'
label="Root Address" label="Root Address"
editable={false}> editable={false}>
<input <pre className="ascribe-pre">{this.state.walletSettings.btc_root_address}</pre>
type="text"
defaultValue={this.state.walletSettings.btc_root_address}/>
</Property> </Property>
<hr /> <hr />
</Form>); </Form>);
@ -204,7 +198,7 @@ let APISettings = React.createClass({
handleTokenRefresh: function(event){ handleTokenRefresh: function(event){
let applicationName = event.target.getAttribute('data-id'); let applicationName = event.target.getAttribute('data-id');
ApplicationActions.refreshApplicationToken(applicationName); ApplicationActions.refreshApplicationToken(applicationName);
let notification = new GlobalNotificationModel('Token refreshed', 'success'); let notification = new GlobalNotificationModel('Token refreshed', 'success', 2000);
GlobalNotificationActions.appendGlobalNotification(notification); GlobalNotificationActions.appendGlobalNotification(notification);
}, },
render() { render() {
@ -235,9 +229,8 @@ let APISettings = React.createClass({
<Form> <Form>
{content} {content}
<hr /> <hr />
</Form> </Form>
</div>); </div>);
} }
return ( return (
<CollapsibleParagraph <CollapsibleParagraph
@ -257,6 +250,9 @@ let APISettings = React.createClass({
</Property> </Property>
<hr /> <hr />
</Form> </Form>
<pre>
Usage: curl &lt;url&gt; -H 'Authorization: Bearer &lt;token&gt;'
</pre>
{content} {content}
</CollapsibleParagraph> </CollapsibleParagraph>
); );

11
sass/ascribe_settings.scss
View File

@ -39,10 +39,7 @@
span { span {
cursor: default; cursor: default;
} }
div { input, div, pre {
color: #666;
}
input {
cursor: default; cursor: default;
color: #666; color: #666;
} }
@ -60,8 +57,10 @@
cursor:pointer; cursor:pointer;
span { input, div, span, pre {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
span {
font-weight: normal; font-weight: normal;
font-size: 0.9em; font-size: 0.9em;
color: rgba(0,0,0,.7); color: rgba(0,0,0,.7);
@ -79,7 +78,7 @@
} }
} }
input { input, pre {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400; font-weight: 400;
font-size: 1.1em; font-size: 1.1em;

3
sass/ascribe_textarea.scss
View File

@ -18,4 +18,7 @@
font-family: inherit; font-family: inherit;
text-align: justify; text-align: justify;
background-color: white; background-color: white;
border: none;
padding: 0;
margin:0;
} }