From d841357d7f68e2b5d763aeef1dc1ce050b6f11df Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Tue, 23 Jun 2015 19:56:53 +0200
Subject: Make merge into label of width 'auto'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/css/aurweb.css | 3 ++-
 web/html/pkgmerge.php   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 6f2a1e59..d67877a0 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -109,6 +109,7 @@ span.hover-help {
 	cursor:help;
 }
 
-label.confirmation {
+label.confirmation,
+#merge-into {
 	width: auto;
 }
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index c651ce9c..f6e951b5 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -53,7 +53,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 				}).attr('autocomplete', 'off');
 			});
 			</script>
-			<p><label for="merge_Into" ><?= __("Merge into:") ?></label>
+			<p><label id="merge-into" for="merge_Into" ><?= __("Merge into:") ?></label>
 			<input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p>
 			<p><label class="confirmation"><input type="checkbox" name="confirm" value="1" />
 			<?= __("Confirm package merge") ?></label></p>
-- 
cgit v1.2.3-24-g4f1b