summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2015-06-23 19:56:53 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-06-27 13:04:03 +0200
commitd841357d7f68e2b5d763aeef1dc1ce050b6f11df (patch)
tree552d3e853e01e4e477cfa7fb3fc06b05632df6fc
parentd1fe28ff7e206b02b42995dc92600af90b7195ae (diff)
downloadaurweb-d841357d7f68e2b5d763aeef1dc1ce050b6f11df.tar.xz
Make merge into label of width 'auto'
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--web/html/css/aurweb.css3
-rw-r--r--web/html/pkgmerge.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 6f2a1e5..d67877a 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 c651ce9..f6e951b 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>