Merge pull request #40 from prysmex/fix-image-close-icon

fix image close icon

Author: SilvaMtz

addon/components/eui-image/index.hbs

@@ -2,7 +2,7 @@
   class={{class-names
     (unless (eq @hasShadow false) "euiImage--hasShadow")
     componentName="EuiImage"
-    size=@size 
+    size=@size
   }}
   ...attributes
 >
@@ -52,15 +52,15 @@
         {{on "click" this.toggleFullscreen}}
       >
         <img class="euiImage-isFullScreen__img" src={{@url}} alt={{@alt}} />
-        <EuiIcon
-          class="euiImage-isFullScreen__icon"
-          @type="cross"
-          @color={{if (not (eq @fullScreenIconColor "dark")) "ghost"}}
-        />
       </button>
       <figcaption class="euiImage__caption">
         {{@caption}}
       </figcaption>
     </figure>
+    <EuiIcon
+      class="euiImage-isFullScreenCloseIcon"
+      @type="cross"
+      @color={{if (not (eq @fullScreenIconColor "dark")) "ghost"}}
+    />
   </EuiOverlayMask>
 {{/if}}

addon/components/eui-overlay-mask/index.hbs

@@ -3,7 +3,6 @@
   insertBefore=null
 }}
   <div
-    role="button"
     class={{class-names
       "euiOverlayMask"
       (unless

tests/dummy/app/templates/demo/image.hbs

@@ -8,7 +8,7 @@
   </EuiPageHeaderSection>
 </EuiPageHeader>
 <EuiPageContent>
-  <EuiPageContentBody class="euiFlexGroup euiFlexGroup--directionColumn">
+  <EuiPageContentBody>
     <EuiText @color="primary">
       Size s
     </EuiText>
@@ -21,6 +21,7 @@
       @allowFullScreen={{true}}
       @fullScreenIconColor="light"
     />
+
     <EuiText @color="accent">
       Size m
     </EuiText>
@@ -33,6 +34,7 @@
       @allowFullScreen={{true}}
       @fullScreenIconColor="light"
     />
+
     <EuiText @color="warning">
       Size l
     </EuiText>
@@ -45,6 +47,7 @@
       @allowFullScreen={{true}}
       @fullScreenIconColor="light"
     />
+
     <EuiText @color="warning">
       Size Custom 300px
     </EuiText>