Merge branch 'master' of https://github.com/bcgov/eDivorce

edivorce/apps/core/static/css/main.scss

@@ -124,18 +124,33 @@ a {
 	padding: 30px 30px 30px 75px;
 	border-radius: 10px;
 	margin-bottom: 20px;
-	background-color: #faebe9;
+	background-color: #fcf8e3;
 	&:after {
-	  content: "\f071";
-	  font-family: FontAwesome;
-	  font-style: normal;
-	  font-weight: normal;
-	  text-decoration: inherit;
-	  position: absolute;
-	  font-size: 24px;
-	  color: #ea604e;
-	  top: 30px;
-	  left: 27px;
+		content: "\f071";
+		font-family: FontAwesome;
+		font-style: normal;
+		font-weight: normal;
+		text-decoration: inherit;
+		position: absolute;
+		font-size: 24px;
+		color: #f0ad4e;
+		top: 30px;
+		left: 27px;
+	}
+	&.hard-stop {
+		background-color: #faebe9;
+		&:after {
+			content: "\f05e";
+			font-family: FontAwesome;
+			font-style: normal;
+			font-weight: normal;
+			text-decoration: inherit;
+			position: absolute;
+			font-size: 24px;
+			color: #ea604e;
+			top: 30px;
+			left: 27px;
+		}
 	}
 }
 
@@ -153,10 +168,10 @@ a {
 .tooltip-inner {
     text-align: left;
     background-color: $brand-titles;
-    padding: 30px;
+    padding: 20px;
 	font-size: 16px;
 	line-height: 24px;
-	max-width: 400px;
+	max-width: 300px;
 	border-radius: 10px;
 	&b {
 		font-size: 18px;

edivorce/apps/core/static/js/main.js

@@ -12,7 +12,15 @@ $('input:radio, input:checkbox').each(function () {
 });
 
 $(function () {
-    $('[data-toggle="tooltip"]').tooltip({trigger: 'click'});
+  $('[data-toggle="popover"]').popover()
+})
+
+$(function () {
+    $('[data-toggle="tooltip"]').tooltip({
+        container: 'body',
+        trigger: 'click',
+        placement:'auto right'
+    });
 
     $('body').on('click', function (e) {
         $('[data-toggle=tooltip]').each(function () {

edivorce/apps/core/templates/prequalification/step_02.html

@@ -19,8 +19,7 @@
         </label>
     </div>
 
-    <div class="information-message bg-danger" id="cannot_divorce_in_bc" hidden>
-        <p><span class="fa fa-ban hard-stop"></span>
+    <div class="information-message bg-danger hard-stop" id="cannot_divorce_in_bc" hidden>
             You must apply for divorce in the Canadian province or territory in which you've lived for a full year immediately before making your application.<br>
             To find out how to apply for a divorce in your province or territory refer to the appropriate
             <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">Provincial or Territorial Government website.</a>

edivorce/apps/core/templates/prequalification/step_04.html

@@ -52,9 +52,8 @@
         </label>
     </div>
 
-    <div class="information-message bg-danger" id="younger_19" hidden>
-        <p><span class="fa fa-ban hard-stop"></span>
-            Sorry, but at this point in time you will need to complete your application for divorce using the
+    <div class="information-message bg-danger hard-stop" id="younger_19" hidden>
+        <p>Sorry, but at this point in time you will need to complete your application for divorce using the
             Supreme Court of B.C. forms (PDF). The
             <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a>
             can be found on the Court Services Branch web site: Supreme Court - Provincial Court.</p>
@@ -72,9 +71,8 @@
         <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, due to illness" data_target_id="need_support" data_reveal_target="true" data_target_class="not-disqualified-other" data_reveal_class="false" %}Yes, due to illness</label></div>
         <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, other reason" data_target_id="need_support" data_reveal_target="true" data_target_class="not-disqualified-other" data_reveal_class="false" %}Yes, other reason(s)</label></div>
     </div>
-    <div class="information-message bg-danger" id="need_support" hidden>
-        <p><span class="fa fa-ban hard-stop"></span>
-            Sorry but at this point in time you will not be able to complete your application for divorce using this online tool.
+    <div class="information-message bg-danger hard-stop" id="need_support" hidden>
+        <p>Sorry but at this point in time you will not be able to complete your application for divorce using this online tool.
             Currently the tool supports a limited number of scenarios. In the meantime, you can file for divorce using the
             <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a>
             provided on the  Supreme Court of B.C. website.  (PDF).</p>

edivorce/apps/core/templates/prequalification/step_05.html

@@ -139,9 +139,8 @@
         </label>
     </div>
 
-    <div class="information-message bg-danger" id="certificate_in_english" hidden>
-        <p><span class="fa fa-ban hard-stop"></span>
-            Sorry, but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The
+    <div class="information-message bg-danger hard-stop" id="certificate_in_english" hidden>
+        <p>Sorry, but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The
             <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a>
             can be found on the Court Services Branch web site.</p>
         <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a>

edivorce/apps/core/templates/prequalification/step_06.html

@@ -79,9 +79,8 @@
         </label>
     </div>
 
-    <div class="information-message bg-danger" id="other_reason" hidden>
-        <p><span class="fa fa-ban hard-stop"></span>
-            If you ask for a divorce due to "other reason" reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.</p>
+    <div class="information-message bg-danger hard-stop" id="other_reason" hidden>
+        <p>If you ask for a divorce due to "other reason" reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.</p>
         <p>At this point in time you will need to complete your application for divorce using the
             <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">PDF version of the forms</a>. The forms can be found on the Court Services Branch web site: Supreme Court - Provincial Court.</p>
         <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a> that may be required for a Joint Divorce can be found on the Legal Services Society web site.</p>