Browse Source

Recompiled css to fix merge conflict

pull/160/head
Foley Lynn 8 years ago
parent
commit
3587720f4c
7 changed files with 20 additions and 8 deletions
  1. +1
    -1
      edivorce/apps/core/static/css/main.css
  2. +1
    -1
      edivorce/apps/core/static/css/main.css.map
  3. +9
    -1
      edivorce/apps/core/static/css/main.scss
  4. +1
    -1
      edivorce/apps/core/templates/prequalification/step_02.html
  5. +4
    -2
      edivorce/apps/core/templates/prequalification/step_04.html
  6. +2
    -1
      edivorce/apps/core/templates/prequalification/step_05.html
  7. +2
    -1
      edivorce/apps/core/templates/prequalification/step_06.html

+ 1
- 1
edivorce/apps/core/static/css/main.css
File diff suppressed because it is too large
View File


+ 1
- 1
edivorce/apps/core/static/css/main.css.map
File diff suppressed because it is too large
View File


+ 9
- 1
edivorce/apps/core/static/css/main.scss View File

@ -696,7 +696,6 @@ div#progress-overlay {
left: 0; left: 0;
right: 0; right: 0;
z-index: 10000; z-index: 10000;
background: url(/Images/transparent.png);
background: rgba(0,0,0,0.35); background: rgba(0,0,0,0.35);
} }
@ -709,6 +708,15 @@ div#progress-overlay-spinner {
z-index: 5000; z-index: 5000;
} }
/* Prequalification hard-stop indicator */
span.hard-stop {
font-size: 2.8em;
display: inline-block;
float: left;
margin: 3px 10px 0 0;
}
/* Transitions & Transforms */ /* Transitions & Transforms */
.on-canvas { .on-canvas {


+ 1
- 1
edivorce/apps/core/templates/prequalification/step_02.html View File

@ -20,7 +20,7 @@
</div> </div>
<div class="information-message bg-danger" id="cannot_divorce_in_bc" hidden> <div class="information-message bg-danger" id="cannot_divorce_in_bc" hidden>
<p>
<p><span class="fa fa-ban hard-stop"></span>
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> 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 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> <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">Provincial or Territorial Government website.</a>


+ 4
- 2
edivorce/apps/core/templates/prequalification/step_04.html View File

@ -53,7 +53,8 @@
</div> </div>
<div class="information-message bg-danger" id="younger_19" hidden> <div class="information-message bg-danger" id="younger_19" hidden>
<p>Sorry but at this point in time you will need to complete your application for divorce using the
<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 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> <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> can be found on the Court Services Branch web site: Supreme Court - Provincial Court.</p>
@ -72,7 +73,8 @@
<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" %}Yes, other reason(s)</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" %}Yes, other reason(s)</label></div>
</div> </div>
<div class="information-message bg-danger" id="need_support" hidden> <div class="information-message bg-danger" 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.
<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.
Currently the tool supports a limited number of scenarios. In the meantime, you can file for divorce using the 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> <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> provided on the Supreme Court of B.C. website. (PDF).</p>


+ 2
- 1
edivorce/apps/core/templates/prequalification/step_05.html View File

@ -140,7 +140,8 @@
</div> </div>
<div class="information-message bg-danger" id="certificate_in_english" hidden> <div class="information-message bg-danger" 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
<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
<a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a> <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> 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> <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a>


+ 2
- 1
edivorce/apps/core/templates/prequalification/step_06.html View File

@ -70,7 +70,8 @@
<div class="radio"><label>{% input_field type="radio" name="divorce_reason" value="other" data_target_id="other_reason" data_reveal_target="true" %}Other reasons (grounds)</label></div> <div class="radio"><label>{% input_field type="radio" name="divorce_reason" value="other" data_target_id="other_reason" data_reveal_target="true" %}Other reasons (grounds)</label></div>
<div class="information-message bg-danger" id="other_reason" hidden> <div class="information-message bg-danger" 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><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>
<p>At this point in time you will need to complete your application for divorce using the <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> <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> <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>


Loading…
Cancel
Save