fix merge conflicts

Author: catarak

client/modules/IDE/actions/project.js

@@ -301,7 +301,8 @@ export function cloneProject(id) {
             error: response.data
           }));
       });
-  });
+    });
+  };
 }
 
 export function showEditProjectName() {

client/styles/components/_sketch-list.scss

@@ -12,8 +12,11 @@
   border-spacing: 0;
   & .sketch-list__dropdown-column {
     width: #{60 / $base-font-size}rem;
+<<<<<<< HEAD
   & .sketch-list__trash-column {
     width: #{36 / $base-font-size}rem;
+=======
+>>>>>>> 807f06f0500481edbeebd6d5df4b09a56b5ce920
     position: relative;
   }
 }
@@ -102,7 +105,26 @@
       & polygon {
         fill: getThemifyVariable('dropdown-color');
       }
+    }
+
+    &:nth-last-child(1) {
+      border-bottom-left-radius: #{6 / $base-font-size}rem;
+      border-bottom-right-radius: #{6 / $base-font-size}rem;
+      margin-bottom: 0;
+    }
+}
+
+.sketch-list__action-close {
+  @include themify(){
+    & path:nth-child(2) {
+      fill: getThemifyVariable('dropdown-color');
+    }
   }
+  position: absolute;
+  top: #{11.604 / $base-font-size}rem;
+  right: #{14 / $base-font-size}rem;
+  width: #{22 / $base-font-size}rem;
+  height: #{18 / $base-font-size}rem;
 }
 
 .sketch-list__action-dialogue {
@@ -203,14 +225,6 @@
   height: #{18 / $base-font-size}rem;
 }
 
-.sketch-list__action-close {
-  position: absolute;
-  top: #{14 / $base-font-size}rem;
-  right: #{14 / $base-font-size}rem;
-  width: #{18 / $base-font-size}rem;
-  height: #{18 / $base-font-size}rem;
-}
-
 
 
 .sketches-table__empty {