From 02f8193743d408208fcdd7f4ad4df5e6d4d59971 Mon Sep 17 00:00:00 2001 From: ddejongh Date: Mon, 22 Jun 2015 18:02:04 +0200 Subject: [PATCH] style tweaks --- js/components/ascribe_forms/form.js | 10 ++++++---- js/components/settings_container.js | 20 ++++++++------------ sass/ascribe_settings.scss | 11 +++++------ sass/ascribe_textarea.scss | 3 +++ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js index 6cd8638a..b24b796b 100644 --- a/js/components/ascribe_forms/form.js +++ b/js/components/ascribe_forms/form.js @@ -102,10 +102,12 @@ let Form = React.createClass({ if (this.state.edited){ buttons = ( -

- - -

+
+

+ + +

+
); } diff --git a/js/components/settings_container.js b/js/components/settings_container.js index d6fc4bcc..bd2307e0 100644 --- a/js/components/settings_container.js +++ b/js/components/settings_container.js @@ -133,19 +133,13 @@ let BitcoinWalletSettings = React.createClass({ name='btc_public_key' label="Bitcoin public key" editable={false}> - +
{this.state.walletSettings.btc_public_key}
- +
{this.state.walletSettings.btc_root_address}

); @@ -204,7 +198,7 @@ let APISettings = React.createClass({ handleTokenRefresh: function(event){ let applicationName = event.target.getAttribute('data-id'); ApplicationActions.refreshApplicationToken(applicationName); - let notification = new GlobalNotificationModel('Token refreshed', 'success'); + let notification = new GlobalNotificationModel('Token refreshed', 'success', 2000); GlobalNotificationActions.appendGlobalNotification(notification); }, render() { @@ -235,9 +229,8 @@ let APISettings = React.createClass({
{content}
-
- ); - + + ); } return (
+
+                    Usage: curl <url> -H 'Authorization: Bearer <token>'
+                
{content}
); diff --git a/sass/ascribe_settings.scss b/sass/ascribe_settings.scss index 85cfa926..1cebf723 100644 --- a/sass/ascribe_settings.scss +++ b/sass/ascribe_settings.scss @@ -39,10 +39,7 @@ span { cursor: default; } - div { - color: #666; - } - input { + input, div, pre { cursor: default; color: #666; } @@ -60,8 +57,10 @@ cursor:pointer; - span { + input, div, span, pre { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + } + span { font-weight: normal; font-size: 0.9em; color: rgba(0,0,0,.7); @@ -79,7 +78,7 @@ } } - input { + input, pre { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 400; font-size: 1.1em; diff --git a/sass/ascribe_textarea.scss b/sass/ascribe_textarea.scss index f349628d..0e6d5ada 100644 --- a/sass/ascribe_textarea.scss +++ b/sass/ascribe_textarea.scss @@ -18,4 +18,7 @@ font-family: inherit; text-align: justify; background-color: white; + border: none; + padding: 0; + margin:0; }