Merge branch "projects"

editor/sass/editor.scss

@@ -158,7 +158,10 @@
     top: -1px;
     bottom: -1px;
 }
-
+#full-shade {
+    @include shade;
+    z-index: 15;
+}
 
 .dialog-form,#dialog-form, #node-config-dialog-edit-form {
     height: 100%;

editor/sass/projects.scss

@@ -444,7 +444,13 @@
     span {
         margin: 0 6px;
     }
-    .button-group {
+    a {
+        color: currentColor;
+        &.disabled {
+            pointer-events: none;
+        }
+    }
+    .sidebar-version-control-change-entry-tools {
         position: absolute;
         top: 4px;
         right: 4px;
@@ -455,7 +461,7 @@
     }
 
     &:hover {
-        .button-group {
+        .sidebar-version-control-change-entry-tools {
             display: block;
         }
     }
@@ -764,3 +770,44 @@ div.projects-dialog-ssh-public-key {
     }
 }
 */
+
+.projects-dialog-branch-list {
+    .red-ui-editableList-container li:last-child {
+        border-bottom: none;
+    }
+}
+
+.projects-dialog-branch-list-entry {
+    span {
+        display: inline-block;
+    }
+    span:first-child {
+        text-align: center;
+        min-width: 30px;
+    }
+    .branch-name {
+        min-width: 150px;
+    }
+    .branch-remote-name {
+        color: #aaa;
+        font-size: 0.9em;
+        min-width: 150px;
+    }
+    .branch-remote-status {
+        color: #aaa;
+        font-size: 0.9em;
+    }
+    .commit {
+        color: #aaa;
+        font-size: 0.9em;
+        padding: 2px 5px;
+
+    }
+
+    .projects-dialog-branch-list-entry-tools {
+        float: right;
+        margin-right: 20px;
+        font-size: 0.9em;
+        color: #999;
+    }
+}