Merge pull request #12 from flyingcarpet-network/feature/FD-136-and-F…

…D-135-fix-label-bugs fix bugs with annotation labels
flyingcarpet-network · Nov 9, 2018 · e8aed50 · e8aed50
2 parents 1c3c5fc + 1a81b38
commit e8aed50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/components/Annotation.js b/src/components/Annotation.js
@@ -281,14 +281,14 @@ export default compose(
           })
         )}
         {props.annotations.map(annotation => (
-          this.shouldAnnotationBeActive(annotation, topAnnotationAtMouse)
-          && (
+          /* this.shouldAnnotationBeActive(annotation, topAnnotationAtMouse)
+          && ( */
             renderContent({
               key: annotation.data.id,
               annotation: annotation,
               imageZoomAmount: props.imageZoomAmount
             })
-          )
+          // )
         ))}
         {!props.disableEditor
           && props.value

diff --git a/src/components/PolygonControls/index.js b/src/components/PolygonControls/index.js
@@ -25,9 +25,10 @@ const Container = styled.div`
 
   animation: ${fadeInScale} 0.31s cubic-bezier(0.175, 0.885, 0.32, 1.275);
   overflow: hidden;
-  margin-left: -50%;
-  margin-right: 50%
 `
+//  margin-left: -50%;
+//  margin-right: 50%
+//`
 
 const Button = styled.div`
   background: whitesmoke;

diff --git a/src/components/RadioButtonEditor/index.js b/src/components/RadioButtonEditor/index.js
@@ -33,7 +33,7 @@ function RadioButtonEditor (props) {
   return (
     <React.Fragment>
       <Inner style={{fontSize: ((0.5 + zoomBetweenHalfAndOne) + 'rem'), padding: ((4 + (4 * zoomBetweenHalfAndOne)) + 'px ' + (8 + (8 * zoomBetweenHalfAndOne)) + 'px')}}>
-        <div><h6 style={{margin: '0px 0px', textAlign: 'center'}}> - Coffee Age - </h6></div>
+        <div><h6 style={{margin: '0px 0px', textAlign: 'center', fontSize: ((0.5 + zoomBetweenHalfAndOne) + 'rem')}}> - Coffee Age - </h6></div>
         <div>
           <label><input type="radio"
             name="age" 
@@ -51,7 +51,7 @@ function RadioButtonEditor (props) {
           /> Mature</label>
         </div>
 
-        <div><h6 style={{margin: '0px 0px', textAlign: 'center'}}> - Renovation Type - </h6></div>
+        <div><h6 style={{margin: '0px 0px', textAlign: 'center', fontSize: ((0.5 + zoomBetweenHalfAndOne) + 'rem')}}> - Renovation Type - </h6></div>
         <div>
           <label><input type="radio"
             name="renovationType"