Merge pull request #5775 from Simek/master

eliminate images "jumping" effect after loading the properties in image viewer
adobe · Nov 6, 2013 · 0ab2b09 · 0ab2b09
2 parents 059fd46 + 5c76765
commit 0ab2b09
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/htmlContent/image-holder.html b/src/htmlContent/image-holder.html
@@ -1,7 +1,9 @@
 <div id="image-holder">
     <div id="img-centering">
-        <div id="img-data"></div>
-        <div id="img-path"></div>
+        <div id="img-header">
+            <div id="img-data"></div>
+            <div id="img-path"></div>	
+        </div>
         <div id="img">
             <div id="img-scale"></div>
             <img id="img-preview" src="file:///{{fullPath}}">

diff --git a/src/styles/brackets.less b/src/styles/brackets.less
@@ -270,6 +270,13 @@ a, img {
         box-shadow: 0 1px 3px rgba(0, 0, 0, 0.36);
         max-height: 90%;
     }
+
+    #img-header {
+        display: inline-block;
+        width: 100%;
+        height: 38px;
+        margin-bottom: 15px;
+    }
 
     #img-data,
     #img-path {
@@ -281,10 +288,7 @@ a, img {
     #img-path::selection {
         background: @selection-color-focused;
     }
-
-    #img-path {
-        margin: 0 0 15px;
-    }
+
     #img {
         position: relative;
     }