aboutsummaryrefslogtreecommitdiff
path: root/skins
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2015-09-11 14:01:32 +0200
committerChristian Ruppert <idl0r@gentoo.org>2015-09-11 14:01:32 +0200
commit5dd5b694109aad8564bd6fda0a25a88ee4f7feab (patch)
treed1c8da5ffc6d889832ab3b2bf7452496303b9648 /skins
parentUpdate InlineHistory, SecureMail and TypeSniffer extensions (diff)
parentBumped version to 5.0 (diff)
downloadbugzilla-5dd5b694109aad8564bd6fda0a25a88ee4f7feab.tar.gz
bugzilla-5dd5b694109aad8564bd6fda0a25a88ee4f7feab.tar.bz2
bugzilla-5dd5b694109aad8564bd6fda0a25a88ee4f7feab.zip
Merge tag 'release-5.0' into bugstest
Diffstat (limited to 'skins')
-rw-r--r--skins/standard/global.css3
1 files changed, 1 insertions, 2 deletions
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 37af44b3e..ab0fc8e30 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -746,7 +746,6 @@ input.required, select.required, span.required_explanation {
background-color: #FFEBEB;
}
-<<<<<<< HEAD
/* Gentoo bar */
body {
margin: 1em;
@@ -811,7 +810,7 @@ body.bz_product_Gentoo_Security #add_comment:after {
body.bz_product_Gentoo_Security #add_comment {
margin-bottom: 2em;
}
-=======
+
form th {
text-align: right;
}