Merge pull request #41 from oslabs-beta/dev

Update dev

Author: Eliza612

app/src/components/main/DirectChildHTML.tsx

@@ -59,8 +59,8 @@ function DirectChildHTML({ childId, name, type, typeId, style }: ChildElement) {
   const interactiveStyle = {
     border:
       state.canvasFocus.childId === childId
-        ? '4px solid #0671e3'
-        : '1px solid grey'
+        ? '2px solid #0671e3'
+        : '1px solid #31343A'
   };
 
   const combinedStyle = combineStyles(
@@ -71,7 +71,7 @@ function DirectChildHTML({ childId, name, type, typeId, style }: ChildElement) {
   return (
     <div
       onClick={onClickHandler}
-      style={{...combinedStyle, backgroundColor: '#1E2024', border: '1px solid #31343A'}}
+      style={{...combinedStyle, backgroundColor: '#1E2024'}}
       ref={drag}
       id={`canv${childId}`}
     >

app/src/components/main/DirectChildHTMLNestable.tsx

@@ -177,8 +177,8 @@ function DirectChildHTMLNestable({
   const interactiveStyle = {
     border:
       state.canvasFocus.childId === childId
-        ? '3px solid #0671e3'
-        : '1px solid grey'
+        ? '2px solid #0671e3'
+        : '1px solid #31343A'
   };
 
   // interactive style to change color when nested element is hovered over
@@ -213,7 +213,7 @@ function DirectChildHTMLNestable({
   return (
     <div
       onClick={onClickHandler}
-      style={{...combinedStyle, backgroundColor: isOver ? '#3c59ba' : '#1E2024', border: '1px solid #31343A'}}
+      style={{...combinedStyle, backgroundColor: isOver ? '#3c59ba' : '#1E2024'}}
       ref={ref}
       id={`canv${childId}`}
     >