Merge pull request #18 from hmrc/develop

Release v0.4.0

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## v0.4.0 - 2017-12-21
+
+### Changed
+* Radio and yes/no components to use new markup
+* Assets frontend version to 3.0.1
+* Default heading class to heading-xlarge
+
 ## v0.3.0 - 2017-12-06
 
 ### Added

src/main/g8/app/views/components/heading.scala.html

@@ -1,3 +1,3 @@
-@(headingKey: String, headingSize: String = "heading-medium")(implicit messages: Messages)
+@(headingKey: String, headingSize: String = "heading-xlarge")(implicit messages: Messages)
 
-<h1 class="@headingSize">@messages(headingKey)</h1>
+<h1 class="@headingSize">@messages(headingKey)</h1>

src/main/g8/app/views/components/input_radio.scala.html

@@ -21,10 +21,13 @@
             }
         </legend>
         @for(input <- inputs) {
-            <label class="block-label selection-button-radio" for="@{input.id}">
-                <input id="@{input.id}" type="radio" name="@{field.name}" value="@{input.value}" @if(field.value == Some(input.value)){checked="checked"} @if(trackGa){data-journey-click="$name$:click:@{input.id}"} />
-                @messages(input.messageKey)
-            </label>
+            <div class="multiple-choice">
+                <input id="@{input.id}" type="radio" name="@{field.id}" value="@{input.value}" @if(field.value == Some(input.value)){checked="checked"} @if(trackGa){data-journey-click="$name$:click:@{input.id}"} />
+
+                <label class="block-label selection-button-radio" for="@{input.id}">
+                    @messages(input.messageKey)
+                </label>
+            </div>
         }
     </fieldset>
 </div>

src/main/g8/app/views/components/input_yes_no.scala.html

@@ -22,14 +22,19 @@
                 <span class="error-notification" id="error-message-@{field.id}-input">@messages(error.message, error.args: _*)</span>
             }
         </legend>
-        <label class="block-label selection-button-radio" for="@{field.id}-yes" data-target="@if(yesAssoc.nonEmpty){@yesAssoc}">
+        <div class="multiple-choice">
             <input id="@{field.id}-yes" type="radio" name="@{field.id}" value="true" @if(field.value.contains("true")){checked="checked"} />
-            @messages("site.yes")
-        </label>
-        <label class="block-label selection-button-radio" for="@{field.id}-no" data-target="@if(noAssoc.nonEmpty){@noAssoc}">
+            <label class="block-label selection-button-radio" for="@{field.id}-yes" data-target="@if(yesAssoc.nonEmpty){@yesAssoc}">
+                @messages("site.yes")
+            </label>
+        </div>
+
+        <div class="multiple-choice">
             <input id="@{field.id}-no" type="radio" name="@{field.id}" value="false" @if(field.value.contains("false")){checked="checked"} />
-            @messages("site.no")
-        </label>
+            <label class="block-label selection-button-radio" for="@{field.id}-no" data-target="@if(noAssoc.nonEmpty){@noAssoc}">
+                @messages("site.no")
+            </label>
+        </div>
 
     </fieldset>
 </div>

src/main/g8/conf/application.conf

@@ -98,7 +98,7 @@ google-analytics {
 }
 
 assets {
-  version = "2.247.0"
+  version = "3.0.1"
   version = \${?ASSETS_FRONTEND_VERSION}
   url = "http://localhost:9032/assets/"
 }

src/main/g8/project/build.properties

@@ -1,2 +1,2 @@
 sbt.version=0.13.15
-hmrc-frontend-scaffold.version=0.3.0
+hmrc-frontend-scaffold.version=0.4.0