From 83fd6e1a529f0b5b0209199a356d4b9126765be1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 16 2015 09:12:45 +0000
Subject: Rename the block "commit" to "commit_block" to avoid conflict


The commit page (where commit are displayed) already has an id="commit"
and having two results in a conflict as well as a graphical bug.

---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 851a266..91c2b18 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -936,7 +936,7 @@ span.CONFLICTS {
     line-height: 100%;
 }
 
-#commit {
+#commit_block {
     padding-top: 2em;
     padding-left: 2em;
 }
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index ef0b84b..75a3eb8 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -39,7 +39,7 @@
 {{ data }}
 </textarea>
 
-<div id="commit">
+<div id="commit_block">
   <div>
       {{ user.username | avatar(24) | safe }}
       {{ user.fullname }}