Merge ~ya-bo-ng/maas:unwrap-code-blocks into ~deadlight/maas:vanilla

[Anthony Dillon]

## Done
Removed the new lines after code which was causing breaking spaces

[LukeWH (0-luke)]

+1

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/code_lines.js b/src/maasserver/static/js/angular/directives/code_lines.js
index 9dd8c6c..160d99a 100644
--- a/src/maasserver/static/js/angular/directives/code_lines.js
+++ b/src/maasserver/static/js/angular/directives/code_lines.js
@@ -33,7 +33,7 @@
                  // its appropriate line number
                  $.each(lines, function() {
                    insert += '<span class="code-line">' +
-                   this + '</span>\n';
+                   this + '</span>';
                  });
                  insert += "</code>";
 
diff --git a/src/maasserver/static/partials/node-result.html b/src/maasserver/static/partials/node-result.html
index f4d9428..a3648f2 100644
--- a/src/maasserver/static/partials/node-result.html
+++ b/src/maasserver/static/partials/node-result.html
@@ -5,7 +5,7 @@
         </div>
     </header>
 </div>
-<div class="ng-hide" data-ng-show="loaded">
+<div class="ng-hide u-no-margin--top" data-ng-show="loaded">
     <header class="p-strip--light is-shallow is-bordered page-header" media-query="min-width: 769px">
         <div class="row">
             <div class="col-8">