creylopez
/
django-ex
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 2 Wiki Activity
Browse Source

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

pull/160/head
Mike Olund 8 years ago
parent
f14d3a2240 8a66924c05
commit
dd79b7f2c0
4 changed files with 22 additions and 11 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      edivorce/apps/core/static/css/main.css
  2. +18
    -6
      edivorce/apps/core/static/css/main.scss
  3. +2
    -3
      edivorce/apps/core/templates/base.html
  4. +1
    -1
      edivorce/apps/core/templates/question/02_claimant.html

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


+ 18
- 6
edivorce/apps/core/static/css/main.scss View File

@ -42,6 +42,7 @@ body {
background: #ffffff;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
min-width: 768px;
}
h1,h2,h3,h4 {
@ -222,6 +223,7 @@ i.fa.fa-question-circle {margin-left: 5px;}
padding: 6px 18px;
background-color: $brand-buttons;
color: #ffffff;
margin-bottom: 12px;
&:hover {
background-color: darken($brand-buttons, 20%);
}
@ -460,34 +462,36 @@ textarea {
/* Column Grid in flexbox */
.row-flex {
display: flex;
flex-direction: row;
flex-wrap: wrap;
height: 100%;
display: flex;
flex-direction: row;
flex-wrap: wrap;
height: 100%;
.col {
flex: 1;
box-sizing: border-box;
order: 3;
}
.content-column {
flex-basis: 100%;
max-width: 800px;
padding: 35px 50px 50px 50px;
}
.progress-column {
flex: 0 0 262px;
background-color: $color-grey-lighter;
order: 2;
}
.dashnav-column {
flex: 0 0 262px;
background-color: $brand-titles;
}
.more_information-column {
flex: 0 0 306px;
flex: 100%;
background-color: $color-grey-lighter;
box-shadow: inset 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
padding: 45px 20px;
font-size: 14px;
line-height: 21px;
order: 1;
.more_information-close {
float: right;
font-size: 24px;
@ -499,6 +503,12 @@ textarea {
padding-right: 25px;
}
}
@media (min-width: 992px) {
.more_information-column {
order: 4;
flex: 0 0 306px;
}
}
&.intro-page {
background: $color-blue-medium url("../img/bg-edivorce__landing.jpg") no-repeat top center fixed;
background-size: cover;
@ -555,6 +565,8 @@ textarea {
}
}
/* Side Progress Navigation */
.progress-column,


+ 2
- 3
edivorce/apps/core/templates/base.html View File

@ -3,12 +3,11 @@
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{% block title %}Ministry of Justice e-Divorce{% endblock %}</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-datepicker3.min.css" %}">


+ 1
- 1
edivorce/apps/core/templates/question/02_claimant.html View File

@ -106,7 +106,7 @@
<h3>How long have you lived in British Columbia?</h3>
<p>Please select one</p>
<div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_you" value="Since birth" %}Since birth</label></div>
<div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_you" value="Moved to British Columbia on" %}Moved to British Columbia on <span class="date-picker-group">{% input_field type="text" name="moved_to_bc_date_you" id="moved_date" class="date-picker other-textbox input-inline" tabindex="-1" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></span></label></div>
<div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_you" value="Moved to British Columbia on" %}Moved to British Columbia on <span class="date-picker-group">{% input_field type="text" name="moved_to_bc_date_you" id="moved_date" class="date-picker other-textbox input-inline" tabindex="-1" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar" aria-hidden="true"></i></span></label></div>
<div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_you" value="Do not live in British Columbia" %}Do not live in British Columbia</label></div>
<p>In order to apply for a divorce in British Columbia, you or your spouse must have been a regular resident in B.C (the legal term is ordinarily resident


Write Preview
Loading…
Cancel
Save