From c6287653f918f946fe5e889d7e48238084120b75 Mon Sep 17 00:00:00 2001
From: Jason Neufeld <jneufeld@google.com>
Date: Sun, 6 Sep 2015 11:53:10 -0700
Subject: [PATCH] Moves the scaling factor into spritesheet export. Cleans up
 CSS and makes description spans with inline styles into divs. Adds a little
 more margin below the scaling factor so it's not too snug with the Download
 PNG button.

---
 src/css/settings-export.css        |  8 ++++----
 src/css/settings.css               |  1 -
 src/templates/settings/export.html | 21 ++++++++-------------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/css/settings-export.css b/src/css/settings-export.css
index 67d6b91e..aad86bb8 100644
--- a/src/css/settings-export.css
+++ b/src/css/settings-export.css
@@ -57,6 +57,10 @@
   color: white;
 }
 
+.scaling-factor {
+  margin-bottom: 10px;
+}
+
 .scaling-factor-input {
   margin: 5px;
   vertical-align: middle;
@@ -73,7 +77,3 @@
   border-radius: 3px;
   text-align: center;
 }
-
-.settings-section--export > .settings-item > label {
-  display: block;
-}
\ No newline at end of file
diff --git a/src/css/settings.css b/src/css/settings.css
index 96100886..a55b5981 100644
--- a/src/css/settings.css
+++ b/src/css/settings.css
@@ -132,7 +132,6 @@
 
 .settings-description {
   margin : 0 0 10px 0;
-  display : inline-block;
 }
 
 .settings-form-section {
diff --git a/src/templates/settings/export.html b/src/templates/settings/export.html
index c2288653..a0665461 100644
--- a/src/templates/settings/export.html
+++ b/src/templates/settings/export.html
@@ -1,27 +1,22 @@
 <div class="settings-section">
-
-  <div class="settings-title settings-section--export">
-    General Export Settings
-  </div>
-  <div class="settings-item">
-    <span class="settings-description" style="display:block"><label for="scaling-factor">Output Scaling Factor</label></span>
-    <span class="settings-description" style="display:block">Currently affects only spritesheet export.</span>
-    <input type="range" class="scaling-factor-input" name="scaling-factor" min="1"  max="32" step="1"/>
-    <span class="scaling-factor-text"></span>
-  </div>
   <div class="settings-title">
     Export Spritesheet
   </div>
   <div class="settings-item">
-    <span class="settings-description">PNG with all frames side by side.</span>
+    <div class="settings-description">PNG with all frames side by side.</div>
+    <div class="settings-description"><label for="scaling-factor">Output Scaling Factor</label></div>
+    <div class="scaling-factor">
+      <input type="range" class="scaling-factor-input" name="scaling-factor" min="1"  max="32" step="1"/>
+      <span class="scaling-factor-text"></span>
+    </div>
     <button type="button" class="button button-primary png-download-button">Download PNG</button>
   </div>
   <div class="settings-title">
     Export as ZIP
   </div>
   <div class="settings-item">
-    <span class="settings-description">ZIP with one PNG file per frame.</span>
-    <span class="settings-description" style="display:block">File names will start with the prefix below.</span>
+    <div class="settings-description">ZIP with one PNG file per frame.</div>
+    <div class="settings-description">File names will start with the prefix below.</div>
     <div class="settings-item">
       <label>Prefix</label>
       <input class="zip-prefix-name  textfield" type="text" placeholder="PNG file prefix ...">