From 0881f6d45c1421167b1e0661c61423961bb74524 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 4 Sep 2014 16:17:43 -0400
Subject: [PATCH] webapp: Fixed visual glitch in xmpp pairing.

It seems that all other uses of <div .col-sm-9> occur outside of
<div .content-box>. This one occurred inside it, when xmpp pairing.

This was introduced in the bootstrap 3 conversion.
---
 debian/changelog                               | 6 ++++++
 doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn | 2 ++
 templates/configurators/xmpp/buddylist.hamlet  | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2780807de3..bc6668b0af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20140832) UNRELEASED; urgency=medium
+
+  * webapp: Fixed visual glitch in xmpp pairing.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 04 Sep 2014 16:17:22 -0400
+
 git-annex (5.20140831) unstable; urgency=medium
 
   * Make --help work when not in a git repository. Closes: #758592
diff --git a/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn b/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
index cf5e413f9b..03b0a5350e 100644
--- a/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
+++ b/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
@@ -10,3 +10,5 @@ Go to the pairing menu
 ### Please provide any additional information below.
 
 ![image of bug](http://i.imgur.com/fZe1ERD.png)
+
+> [[fixed|done]] --[[Joey]]
diff --git a/templates/configurators/xmpp/buddylist.hamlet b/templates/configurators/xmpp/buddylist.hamlet
index 8c77098dd2..069f78ff4d 100644
--- a/templates/configurators/xmpp/buddylist.hamlet
+++ b/templates/configurators/xmpp/buddylist.hamlet
@@ -1,4 +1,4 @@
-<div .col-sm-9 ##{ident}>
+<div ##{ident}>
   <table .table>
     <tbody>
     $if null buddies