From f30ce1f9eb77954092456e3843cc2b62483e3667 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 20 Jun 2016 14:25:11 +0100
Subject: [PATCH] Cannot add twitter credentials Fixes #913

---
 CHANGELOG.md            |  3 ++-
 editor/js/ui/tray.js    |  3 +--
 editor/sass/editor.scss | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fba6d9be..454d16293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
-#### xxx: unreleased
+#### 0.14.2: Maintenance Release
 
 Fixes
 
+ - Cannot add new twitter credentials. Fixes #913
  - Support array references in Debug property field
 
 #### 0.14.1: Maintenance Release
diff --git a/editor/js/ui/tray.js b/editor/js/ui/tray.js
index 0892455f0..3c821e5e3 100644
--- a/editor/js/ui/tray.js
+++ b/editor/js/ui/tray.js
@@ -39,8 +39,7 @@ RED.tray = (function() {
         if (options.buttons) {
             for (var i=0;i<options.buttons.length;i++) {
                 var button = options.buttons[i];
-
-                var b = $('<button>').appendTo(buttonBar);
+                var b = $('<button>').button().appendTo(buttonBar);
                 if (button.id) {
                     b.attr('id',button.id);
                 }
diff --git a/editor/sass/editor.scss b/editor/sass/editor.scss
index 1bdbf21b9..f647bff16 100644
--- a/editor/sass/editor.scss
+++ b/editor/sass/editor.scss
@@ -83,8 +83,12 @@
             border-color: $editor-button-background-primary;
             color: $editor-button-color-primary;
             background: $editor-button-background-primary;
-
-            &:not(.disabled):hover {
+            &.disabled, &.ui-state-disabled {
+                background: none;
+                color: $editor-button-color;
+                border-color: $form-input-border-color;
+            }
+            &:not(.disabled):not(.ui-button-disabled):hover {
                 border-color: $editor-button-background-primary-hover;
                 background: $editor-button-background-primary-hover;
                 color: $editor-button-color-primary !important;
@@ -101,8 +105,6 @@
         }
 
 
-
-
         &.leftButton {
             float: left;
             margin-top: 1px;
@@ -110,6 +112,9 @@
         &:not(.leftButton):not(:last-child) {
             margin-right: 16px;
         }
+        &.ui-state-disabled {
+            opacity: 1;
+        }
     }
 }