Merge branch 'master' into add-get-started-page

app/assets/javascripts/previewPane.js

@@ -1,9 +1,8 @@
-(function () {
+(function (global) {
 
   'use strict';
 
-  const root = this,
-      $ = this.jQuery;
+  $ = global.jQuery;
 
   let branding_style = $('.multiple-choice input[name="branding_style"]:checked');
 
@@ -34,4 +33,4 @@
   $form.find('button[type="submit"]').text('Save');
 
   $('fieldset').on('change', 'input[name="branding_style"]', setPreviewPane);
-})();
+})(window);

app/assets/javascripts/updateContent.js

@@ -1,8 +1,8 @@
-(function(Modules) {
+(function(global) {
   "use strict";
 
   var queues = {};
-  var dd = new diffDOM();
+  var dd = new global.diffDOM();
 
   var getRenderer = $component => response => dd.apply(
     $component.get(0),
@@ -43,7 +43,7 @@
     );
   };
 
-  Modules.UpdateContent = function() {
+  global.GOVUK.Modules.UpdateContent = function() {
 
     this.start = component => poll(
       getRenderer($(component)),
@@ -55,4 +55,4 @@
 
   };
 
-})(window.GOVUK.Modules);
+})(window);

app/assets/stylesheets/components/textbox.scss

@@ -39,7 +39,8 @@
     padding-bottom: $gutter-half;
     z-index: 10;
 
-    .placeholder {
+    .placeholder,
+    .placeholder-conditional {
       color: transparent;
     }
 

app/assets/stylesheets/main.scss

@@ -76,6 +76,7 @@ $path: '/static/images/';
 @import 'views/notification';
 @import 'views/send';
 @import 'views/get_started';
+@import 'views/history';
 
 // TODO: break this up
 @import 'app';

app/assets/stylesheets/views/history.scss

@@ -0,0 +1,29 @@
+$item-top-padding: $gutter-half;
+
+.history-list {
+
+  @include core-19;
+  margin-bottom: $gutter;
+
+  &-item {
+
+    padding: $item-top-padding 0 $gutter-half 0;
+    border-top: 1px solid $border-colour;
+    position: relative;
+
+    &:last-child {
+      border-bottom: 1px solid $border-colour;
+    }
+
+  }
+
+  &-user {
+    display: block;
+  }
+
+  &-time {
+    display: block;
+    color: $secondary-text-colour;
+  }
+
+}