Clean up subflow editor

- new appearance of subflow tabs
 - input/output buttons now counters
 - allow multiple input wires to the same node when converting to subflow
 - ensure edit history is propagated properly to instance nodes

editor/sass/header.scss

@@ -47,7 +47,7 @@ span.logo {
     font-size: 30px;
     line-height: 30px;
     text-decoration: none;
-    
+
     span {
         vertical-align: middle;
         font-size: 16px !important;
@@ -55,14 +55,14 @@ span.logo {
     img {
         height: 18px;
     }
-    
+
     a {
         color: inherit;
         &:hover {
             text-decoration: none;
         }
     }
-    
+
 }
 
 .header-toolbar {
@@ -70,13 +70,13 @@ span.logo {
     margin: 0;
     list-style: none;
     float: right;
-    
+
     > li {
         display: inline-block;
         padding: 0;
         margin: 0;
         position: relative;
-        
+
     }
 }
 
@@ -97,19 +97,19 @@ span.logo {
     vertical-align: middle;
     border-left: 2px solid #000;
     border-right: 2px solid #000;
-    
+
     &:hover {
         border-color: $headerMenuItemHover;
     }
 }
 
-.button-group {
+#header .button-group {
     display: inline-block;
     margin: auto 15px;
     vertical-align: middle;
     clear: both;
 }
-.button-group > a {
+#header .button-group > a {
     display: inline-block;
     float: left;
     line-height: 22px;
@@ -122,11 +122,11 @@ span.logo {
 .deploy-button {
     background: $deployButton;
     color: #eee !important;
-    
+
     &:hover {
         background: $deployButtonHover;
     }
-    
+
     &:active {
         background: $deployButtonActive;
         color: #ccc !important;
@@ -134,18 +134,18 @@ span.logo {
 }
 
 #btn-deploy {
-    
+
     padding: 4px 12px;
-    
+
     &.disabled {
         cursor: default;
         background: $deployDisabledButton;
         color: #999 !important;
-        
+
         img {
             opacity: 0.3;
         }
-        
+
         &+ #btn-deploy-options {
             background: $deployDisabledButton;
             color: #ddd;
@@ -157,7 +157,7 @@ span.logo {
             background: $deployDisabledButton;
         }
     }
-    
+
     img {
         margin-right: 8px;
     }
@@ -264,4 +264,3 @@ span.logo {
     font-size: 16px;
     color: #fff;
 }
-

editor/sass/tabs.scss

@@ -21,13 +21,10 @@ ul.red-ui-tabs {
     display: block;
     height: 35px;
     box-sizing:border-box;
+    white-space: nowrap;
     border-bottom: 1px solid $primary-border-color;
     background: #fff;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+    @include disable-selection;
 }
 
 ul.red-ui-tabs li {
@@ -110,3 +107,16 @@ ul.red-ui-tabs li.active {
 ul.red-ui-tabs li.active a {
     color: #333;
 }
+
+ul.red-ui-tabs li img {
+    margin-left: -8px;
+    margin-right: 3px;
+    margin-top: -2px;
+    opacity: 0.1;
+    width: 20px;
+    height: 20px;
+    vertical-align: middle;
+}
+ul.red-ui-tabs li.active img {
+    opacity: 0.2;
+}

editor/sass/workspaceToolbar.scss

@@ -17,6 +17,9 @@
 
 #workspace-toolbar {
     display: none;
+    color: $workspace-button-color;
+    font-size: 12px;
+    line-height: 18px;
     position: absolute;
     top: 35px;
     left:0;
@@ -26,12 +29,46 @@
     box-sizing: border-box;
     background: #fff;
     border-bottom: 1px solid $secondary-border-color;
-}
+    white-space: nowrap;
+
+    .button {
+        @include workspace-button;
+        margin-right: 10px;
+        padding: 2px 8px;
+    }
+
+    .button-group {
+        @include disable-selection;
+
+        .button:first-child {
+            margin-right: 0;
+        }
+
+        &:not(.spinner-group) {
+            .button:not(:first-child) {
+                border-left: none;
+            }
+        }
+        .button.active {
+            background: $workspace-button-background-active;
+            cursor: default;
+        }
+    }
+
+    .spinner-value {
+        width: 25px;
+        color: $workspace-button-color;
+        padding: 0 5px;
+        display: inline-block;
+        text-align: center;
+        border-top: 1px solid $secondary-border-color;
+        border-bottom: 1px solid $secondary-border-color;
+        margin: 0;
+        height: 24px;
+        font-size: 12px;
+        background: #f9f9f9;
+        line-height: 22px;
+        box-sizing: border-box;
+    }
 
-#workspace-toolbar .button {
-    @include workspace-button;
-    line-height: 18px;
-    font-size: 12px;
-    margin-right: 5px;
-    padding: 2px 8px;
 }