From d90d9bda1d9459f7fe8bf469bb2201d1ab637584 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Sun, 25 Nov 2012 21:05:48 -0800
Subject: [PATCH] Use monospace font when editing commit message

Layout matters on a commit message, because tools don't line wrap
automatically. Use a monospaced font like we do at display time so
the lines in the editor line up correctly.

Update the width to be 72 characters in the monospaced font, to
encourage authors to keep the width of a message within the confines
of an 80 column terminal after git log adds its formatting.

Change-Id: I8563e666602316a73b0f43eb37e353791e04fbb2
---
 .../google/gerrit/client/changes/CommitMessageBlock.java   | 7 ++++---
 .../src/main/java/com/google/gerrit/client/gerrit.css      | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
index 663a9e3ca4..2cbb4755f0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
@@ -21,8 +21,6 @@ import com.google.gerrit.client.ui.CommentedActionDialog;
 import com.google.gerrit.common.data.ChangeDetail;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gwt.user.client.ui.Composite;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.PreElement;
 import com.google.gwt.dom.client.Style.Display;
@@ -30,6 +28,7 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Image;
@@ -98,9 +97,11 @@ public class CommitMessageBlock extends Composite {
                 .titleEditCommitMessage(), Util.C.headingEditCommitMessage(),
                 new ChangeDetailCache.IgnoreErrorCallback() {}) {
               {
-                message.setCharacterWidth(80);
+                message.setCharacterWidth(72);
                 message.setVisibleLines(20);
                 message.setText(commitMessage);
+                message.addStyleName(Gerrit.RESOURCES.css()
+                    .changeScreenDescription());
               }
 
               @Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
index c812b5fc1b..f8d0275a6f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -853,7 +853,8 @@ a:hover {
   margin-left: 10px;
 }
 
-.changeScreenDescription {
+.changeScreenDescription,
+.changeScreenDescription textarea {
   white-space: pre;
   font-family: mono-font;
   font-size: 8pt;