From b6e97541f28076132a181c18455c8822268821b7 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Mon, 8 Apr 2013 13:15:20 -0400
Subject: [PATCH] settings: Format API key link like other forms

(imported from commit 805d3cfffcbd7f1b4274f49b0b6c2c6902b111c2)
---
 templates/zephyr/settings.html  | 9 +++++++--
 zephyr/static/styles/zephyr.css | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/templates/zephyr/settings.html b/templates/zephyr/settings.html
index 932ba71ee5..5d1f3df767 100644
--- a/templates/zephyr/settings.html
+++ b/templates/zephyr/settings.html
@@ -6,8 +6,13 @@
 
       <hr class="settings_separator invisible">
 
-      <div id="api_key_button_box">
-          <a href="#api-settings" id="api_key_button">Show API key</a>
+      <div class="form-horizontal" id="api_key_button_box">
+          <div class="control-group">
+              <label class="control-label label_for_text">API key</label>
+              <div class="controls">
+                  <a href="#api-settings" id="api_key_button">(show)</a>
+              </div>
+          </div>
       </div>
       <div id="get_api_key_box">
           <p>Please re-enter your password to confirm your identity.</p>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 0da04abbe3..8e049a171b 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1082,3 +1082,8 @@ table.floating_recipient {
     /* Same width as a Bootstrap default text <input> with padding */
     width: 220px;
 }
+
+/* Override padding-top on form labels when they label only text */
+.form-horizontal .label_for_text {
+    padding-top: 0;
+}