Merge pull request #255 from alphagov/pc-try-out-terrific-new-toolkit

Bring in new toolkit with new input fields
Crown-Commercial-Service · Feb 23, 2017 · 79a500a · 79a500a
2 parents bf86b44 + 87a25c2
commit 79a500a
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 200 deletions.
diff --git a/app/assets/javascripts/_selection-buttons.js b/app/assets/javascripts/_selection-buttons.js
@@ -4,10 +4,7 @@
 
     if (!GOVUK.SelectionButtons) return;
 
-    new GOVUK.SelectionButtons('.selection-button input', {
-      'focusedClass' : 'selection-button-focused',
-      'selectedClass' : 'selection-button-selected'
-    });
+    new GOVUK.SelectionButtons('.selection-button input');
 
   };
 

diff --git a/app/assets/javascripts/_shim-links-with-button-role.js b/app/assets/javascripts/_shim-links-with-button-role.js
@@ -0,0 +1,15 @@
+(function(GOVUK, GDM) {
+
+  GDM.shimLinksWithButtonRole = function() {
+
+    if (!GOVUK.shimLinksWithButtonRole) return;
+
+    GOVUK.shimLinksWithButtonRole.init({
+      selector: '[class^=link-button]'
+    });
+
+  };
+
+  GOVUK.GDM = GDM;
+
+}).apply(this, [GOVUK||{}, GOVUK.GDM||{}]);
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -12,7 +12,12 @@
 //= include ../../../bower_components/digitalmarketplace-frontend-toolkit/toolkit/javascripts/list-entry.js
 //= include ../../../bower_components/digitalmarketplace-frontend-toolkit/toolkit/javascripts/word-counter.js
 //= include ../../../node_modules/govuk_frontend_toolkit/javascripts/govuk/selection-buttons.js
-//= include _selection-buttons.js
+//= include ../../../node_modules/govuk_frontend_toolkit/javascripts/govuk/shim-links-with-button-role.js
+
+; // JavaScript in the govuk_frontend_toolkit doesn't have trailing semicolons
+
 //= include _scroll-through-statistics.js
+//= include _selection-buttons.js
+//= include _shim-links-with-button-role.js
 //= include _tables-to-charts.js
 //= include ../../../bower_components/digitalmarketplace-frontend-toolkit/toolkit/javascripts/module-loader.js
diff --git a/app/assets/scss/application.scss b/app/assets/scss/application.scss
@@ -1,5 +1,10 @@
 $path: "/admin/static/images/";
 
+/* Blocks shared between multiple selectors */
+@import "toolkit/shared_placeholders/_dm-typography.scss";
+@import "toolkit/shared_placeholders/_placeholders.scss";
+@import "toolkit/shared_placeholders/_temporary-messages.scss";
+
 // Digital Marketplace front end toolkit components
 @import "forms/_option-select.scss";
 @import "forms/_keyword-search.scss";
@@ -23,10 +28,6 @@ $path: "/admin/static/images/";
 @import "toolkit/previous-next-navigation";
 @import "toolkit/secondary-action-link";
 
-/* Blocks shared between multiple selectors */
-@import "shared_placeholders/_temporary-messages.scss";
-@import "shared_placeholders/_dm-typography.scss";
-
 // Admin app styles
 @import "_reset";
 @import "_footer";
@@ -81,3 +82,8 @@ $path: "/admin/static/images/";
 .break-email {
   word-break: break-all;
 }
+
+.question + .secondary-action-link {
+  margin-top: -36px;
+  margin-bottom: 40px;
+}
diff --git a/app/templates/login.html b/app/templates/login.html
@@ -41,7 +41,7 @@
               <div class="validation-wrapper">
             {% endif %}
               <div class="question">
-                    {{ form.email_address.label(class="question-heading-with-hint") }}
+                    {{ form.email_address.label(class="question-heading") }}
                     <p class="hint">
                         Enter the email address you used to register with the Digital Marketplace
                     </p>

diff --git a/app/templates/macros/forms.html b/app/templates/macros/forms.html
diff --git a/app/templates/view_supplier_users.html b/app/templates/view_supplier_users.html
@@ -160,7 +160,7 @@
                   <div class="validation-wrapper">
                       {% endif %}
                       <div class="question">
-                          {{ invite_form.email_address.label(class="question-heading-with-hint") }}
+                          {{ invite_form.email_address.label(class="question-heading") }}
                           <p class="hint">
                               Enter the email address of the person you wish to invite
                           </p>
@@ -189,7 +189,7 @@
                     <div class="validation-wrapper">
                         {% endif %}
                         <div class="question">
-                            {{ move_user_form.user_to_move_email_address.label(class="question-heading-with-hint") }}
+                            {{ move_user_form.user_to_move_email_address.label(class="question-heading") }}
                             <p class="hint">
                                 Enter the email address of the existing user you wish to move to this supplier
                             </p>

diff --git a/bower.json b/bower.json
@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "dependencies": {
     "jquery": "1.11.2",
-    "digitalmarketplace-frontend-toolkit": "https://github.com/alphagov/digitalmarketplace-frontend-toolkit.git#v19.2.1",
-    "govuk_template": "https://github.com/alphagov/govuk_template/releases/download/v0.17.3/jinja_govuk_template-0.17.3.tgz",
+    "digitalmarketplace-frontend-toolkit": "https://github.com/alphagov/digitalmarketplace-frontend-toolkit.git#v20.0.0",
+    "govuk_template": "https://github.com/alphagov/govuk_template/releases/download/v0.19.2/jinja_govuk_template-0.19.2.tgz",
     "digitalmarketplace-frameworks": "https://github.com/alphagov/digitalmarketplace-frameworks.git#v5.5.0",
     "hogan": "3.0.2",
     "c3": "0.4.10"

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "bower": "1.7.1",
     "del": "1.1.1",
-    "govuk_frontend_toolkit": "4.12.0",
+    "govuk_frontend_toolkit": "5.0.3",
     "gulp": "3.8.7",
     "gulp-filelog" : "0.4.1",
     "gulp-include": "1.1.1",