From 23f21bcda25c4a1210013853766e580a25637d18 Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 29 Jul 2014 12:31:34 -0700
Subject: [PATCH 1/5] Style the mini editors for a constant height

Adds an @input-font-size variable.
---
 static/editor.less                 | 12 +++++++++---
 static/variables/ui-variables.less |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/static/editor.less b/static/editor.less
index ff1efa02d..cdabaa897 100644
--- a/static/editor.less
+++ b/static/editor.less
@@ -84,9 +84,15 @@
     }
   }
 
-  .placeholder-text {
-    position: absolute;
-    color: @text-color-subtle;
+  &.mini {
+    font-size: @input-font-size;
+    line-height: @component-line-height;
+    max-height: @component-line-height + 2; // +2 for borders
+
+    .placeholder-text {
+      position: absolute;
+      color: @text-color-subtle;
+    }
   }
 }
 
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index 295b6bf19..f12964b8b 100644
--- a/static/variables/ui-variables.less
+++ b/static/variables/ui-variables.less
@@ -67,6 +67,7 @@
 // Sizes
 
 @font-size: 13px;
+@input-font-size: 14px;
 
 @disclosure-arrow-size: 12px;
 

From 0360a1918c61a38f080e54835ce4fa4f2f06ea8f Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 29 Jul 2014 12:33:01 -0700
Subject: [PATCH 2/5] Upgrade atom-light-ui for mini editor fixes

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8aed9d767..2f57719c7 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "atom-dark-syntax": "0.19.0",
     "atom-dark-ui": "0.32.0",
     "atom-light-syntax": "0.20.0",
-    "atom-light-ui": "0.28.0",
+    "atom-light-ui": "0.29.0",
     "base16-tomorrow-dark-theme": "0.20.0",
     "base16-tomorrow-light-theme": "0.4.0",
     "solarized-dark-syntax": "0.22.0",

From 729ff461f18159a64fbb852625ba5ad173aa731a Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 29 Jul 2014 12:46:01 -0700
Subject: [PATCH 3/5] Upgrade settings-view for mini editor changes

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2f57719c7..10bc4b1fd 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "open-on-github": "0.29.0",
     "package-generator": "0.31.0",
     "release-notes": "0.36.0",
-    "settings-view": "0.136.0",
+    "settings-view": "0.137.0",
     "snippets": "0.50.0",
     "spell-check": "0.39.0",
     "status-bar": "0.41.0",

From 0d1c11764bb1e1718650ee245de0b04116bf42f5 Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 29 Jul 2014 12:54:49 -0700
Subject: [PATCH 4/5] Upgrade dark-ui theme for new variable

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 10bc4b1fd..b1be7511d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.19.0",
-    "atom-dark-ui": "0.32.0",
+    "atom-dark-ui": "0.33.0",
     "atom-light-syntax": "0.20.0",
     "atom-light-ui": "0.29.0",
     "base16-tomorrow-dark-theme": "0.20.0",

From 25601d691d965c4ee5034e5fe1d0380371b53191 Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 29 Jul 2014 13:06:46 -0700
Subject: [PATCH 5/5] Pull the mini editor styles out from react rule

---
 static/editor.less | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/static/editor.less b/static/editor.less
index cdabaa897..4f5201b59 100644
--- a/static/editor.less
+++ b/static/editor.less
@@ -83,16 +83,16 @@
       }
     }
   }
+}
 
-  &.mini {
-    font-size: @input-font-size;
-    line-height: @component-line-height;
-    max-height: @component-line-height + 2; // +2 for borders
+.editor.mini {
+  font-size: @input-font-size;
+  line-height: @component-line-height;
+  max-height: @component-line-height + 2; // +2 for borders
 
-    .placeholder-text {
-      position: absolute;
-      color: @text-color-subtle;
-    }
+  .placeholder-text {
+    position: absolute;
+    color: @text-color-subtle;
   }
 }
 
@@ -307,8 +307,4 @@
   .scroll-view {
     overflow: hidden;
   }
-
-  .placeholder-text {
-    color: @text-color-subtle;
-  }
 }