Merge lp:~cjohnston/launchpad/ic-js-cleanup into lp:launchpad

[Chris Johnston]

Fix CSS related issues with wgrant's ic-js-cleanup branch.

[William Grant (wgrant)]

review: Needs Information

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2014-05-20 20:52:45 +0000
+++ lib/canonical/launchpad/icing/style.css	2014-05-20 20:52:45 +0000
@@ -584,6 +584,7 @@
 table.diff {
    white-space: pre-wrap;
    width: 100%;
+   table-layout: fixed;
    background-color: white;
    margin-bottom: 0.5em;
 }
@@ -593,17 +594,42 @@
   background-color: #f6f6f6;
   color: #999;
   border-right: solid 4px white;
+  width: 5%;
 }
 table.diff .line-no.active {
-  background: url(/@@/edit) #f6f6f6 center left no-repeat;
+  background: url(/@@/add) #f6f6f6 center left no-repeat;
 }
 table.diff .diff-chunk, table.diff .diff-file, table.diff .diff-header {
  font-weight: bold;
 }
 table.diff .diff-added { background-color: #92ED92; }
 table.diff .diff-removed { background-color: #FF7F7F; }
-table.diff .inline-comments > td > div { margin: 0px 1em; }
-
+table.diff .inline-comments > td > div {
+  margin: 0px 1em;
+  word-wrap: break-word;
+  font-family: monospace;
+}
+table.diff .inline-comments .yui3-ieditor { padding-right:0!important; }
+table.diff .inline-comments .yui3-ieditor-multiline .yui3-ieditor-btns .bg-top-label button.lazr-btn {
+  word-wrap: normal;
+}
+table.diff .inline-comments .yui3-ieditor-multiline .yui3-ieditor-btns .bg-top-label {
+  background-image: none!important;
+  margin-right: -7px!important;
+  margin-top: 18px!important;
+}
+table.diff .inline-comments .yui3-ieditor-input textarea {
+  width: 92%;
+  max-width: 92%;
+  float: left;
+}
+table.diff .inline-comments .yui3-ieditor-input {
+  width: auto!important;
+  margin-right: 0;
+  margin-bottom: 5px;
+  overflow: hidden;
+}
+  
 .back-link { margin-top: 3em; }
 
 .reviews {

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2014-05-14 00:48:31 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2014-05-20 20:52:45 +0000
@@ -36,6 +36,9 @@
     #add-comment-review-fields div {
       display: inline;
     }
+    .yui3-publishdrafts {
+      padding-left: 3px;
+    }
     #proposal-summary th {
       font-weight: bold;
       color: #717171;