launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:git-merge-instructions-mp-tweak-style into launchpad:master.

Commit message:
Remove class="command" from git MP merge guidelines

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/393703

This resulted in `padding-left: 2em;` (see lib/canonical/launchpad/icing/css/typography.scss) which IMO doesn't look quite right here: it's better for the merge guidelines to be aligned with the other items in the same table column.  Simply removing the class looks better.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:git-merge-instructions-mp-tweak-style into launchpad:master.

diff --git a/lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt b/lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt
index 0fcf514..09841d6 100644
--- a/lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt
+++ b/lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt
@@ -124,13 +124,13 @@
     <tr id="summary-row-merge-instruction-git" tal:condition="python: view.user and context.source_git_repository">
       <th>Merge guidelines:</th>
       <td>
-        <tt id="remote-add" class="command" tal:content="string:git remote add ${context/source_git_repository/owner/name} ${view/source_git_ssh_url}" />
+        <tt id="remote-add" tal:content="string:git remote add ${context/source_git_repository/owner/name} ${view/source_git_ssh_url}" />
         <br />
-        <tt id="remote-update" class="command" tal:content="string:git remote update ${context/source_git_repository/owner/name}" />
+        <tt id="remote-update" tal:content="string:git remote update ${context/source_git_repository/owner/name}" />
         <br />
-        <tt id="checkout-cmd" class="command" tal:content="string:git checkout ${context/merge_target/name}"/>
+        <tt id="checkout-cmd" tal:content="string:git checkout ${context/merge_target/name}"/>
         <br />
-        <tt id="merge-cmd" class="command" tal:content="string:git merge ${context/source_git_repository/owner/name}/${context/merge_source/name}" />
+        <tt id="merge-cmd" tal:content="string:git merge ${context/source_git_repository/owner/name}/${context/merge_source/name}" />
       </td>
     </tr>