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

Set up internal SASS pipeline, spelling

pull/160/head
Justin Johnson 8 years ago
parent
261b15e811
commit
48d6fbf47a
9 changed files with 1289 additions and 54 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1251
    -2
      edivorce/apps/core/static/css/main.css
  2. +8
    -6
      edivorce/apps/core/static/css/main.css.map
  3. +5
    -5
      edivorce/apps/core/static/css/main.scss
  4. +2
    -1
      edivorce/apps/core/templates/base.html
  5. +7
    -7
      edivorce/apps/core/templates/dashboard/print_form.html
  6. +0
    -20
      edivorce/apps/core/templates/partials/review/orders.html
  7. +12
    -12
      edivorce/apps/core/templates/question/11_review.html
  8. +2
    -1
      edivorce/settings/base.py
  9. +2
    -0
      edivorce/settings/local.py

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


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


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

@ -853,7 +853,7 @@ textarea {
margin-bottom: 0; margin-bottom: 0;
} }
.review-butons {
.review-buttons {
float: left; float: left;
padding: 0 15px 20px; padding: 0 15px 20px;
margin: 0 0 0 32px; margin: 0 0 0 32px;
@ -942,7 +942,7 @@ textarea {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
.review-butons {
.review-buttons {
margin: 0; margin: 0;
padding-left: 8px; padding-left: 8px;
@media (min-width: 991px) { @media (min-width: 991px) {
@ -1000,7 +1000,7 @@ textarea {
margin-bottom: 0; margin-bottom: 0;
} }
.review-butons {
.review-buttons {
float: right; float: right;
padding: 0 15px 10px; padding: 0 15px 10px;
margin: 0; margin: 0;
@ -1435,7 +1435,7 @@ textarea {
border: 3px solid #a94442; border: 3px solid #a94442;
padding-top: 8px; padding-top: 8px;
padding-left: 8px; padding-left: 8px;
#terms_warning { #terms_warning {
color: #a94442; color: #a94442;
} }
@ -1577,4 +1577,4 @@ span.hard-stop {
transition: 0.2s ease-out all; transition: 0.2s ease-out all;
margin-right: 0; margin-right: 0;
} }
}
}

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

@ -1,4 +1,5 @@
{% load static %} {% load static %}
{% load sass_tags %}
<!doctype html> <!doctype html>
<html class="no-js" lang="en"> <html class="no-js" lang="en">
<head> <head>
@ -14,7 +15,7 @@
<link rel="stylesheet" type="text/css" href="{% static "css/font-awesome.min.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "css/font-awesome.min.css" %}">
{% load compress %} {% load compress %}
{% compress css %} {% compress css %}
<link rel="stylesheet" type="text/css" href="{% static "css/main.css" %}" />
<link rel="stylesheet" type="text/css" href="{% sass_src "css/main.scss" %}" />
{% endcompress %} {% endcompress %}
{% include 'partials/gtm_head.html' %} {% include 'partials/gtm_head.html' %}


+ 7
- 7
edivorce/apps/core/templates/dashboard/print_form.html View File

@ -44,7 +44,7 @@
<span>Notice of Joint Family Claim Form (F1)</span> <span>Notice of Joint Family Claim Form (F1)</span>
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '1' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '1' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -73,7 +73,7 @@
<span>Requisition Form (F35)</span> <span>Requisition Form (F35)</span>
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '35' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '35' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -98,7 +98,7 @@
<span>Draft Final Order Form (F52)</span> <span>Draft Final Order Form (F52)</span>
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '52' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '52' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -142,7 +142,7 @@
<span>Certificate of Pleadings Form (F36)</span> <span>Certificate of Pleadings Form (F36)</span>
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '36' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '36' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -184,7 +184,7 @@
<span>Affidavit Desk Order Divorce Form (F38) - signing together</span> <span>Affidavit Desk Order Divorce Form (F38) - signing together</span>
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '38_we' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '38_we' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -256,7 +256,7 @@
Claimant 1 Claimant 1
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '38_claimant1' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '38_claimant1' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print
@ -268,7 +268,7 @@
Claimant 2 Claimant 2
</div> </div>
</div> </div>
<p class="review-butons">
<p class="review-buttons">
<a href="{% url 'pdf_form' '38_claimant2' %}" class="btn btn-primary spinner" <a href="{% url 'pdf_form' '38_claimant2' %}" class="btn btn-primary spinner"
target="_blank"><i class="fa fa-print" aria-hidden="true"></i> target="_blank"><i class="fa fa-print" aria-hidden="true"></i>
Review and Print Review and Print


+ 0
- 20
edivorce/apps/core/templates/partials/review/orders.html View File

@ -1,20 +0,0 @@
{% load input_field %}
{% if questions %}
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Question</th>
<th>Response</th>
</tr>
</thead>
<tbody>
{% for question in questions %}
<tr>
<td width="75%" style="padding-right: 5%">{{question.question__name}} {{question.question__key}}</td>
<td width="25%">{% strip_value source=question.value question_key=question.question__key %}</td>
<td>{{question.value}}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}

+ 12
- 12
edivorce/apps/core/templates/question/11_review.html View File

@ -16,7 +16,7 @@
Qualifying Questions Qualifying Questions
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'prequalification' '01' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'prequalification' '01' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_prequal"> <div class="collapse in" id="review_step_prequal">
<div> <div>
@ -31,7 +31,7 @@
Step 1: What are you asking for Step 1: What are you asking for
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_1"> <div class="collapse in" id="review_step_1">
<div> <div>
@ -46,7 +46,7 @@
Step 2: Your information Step 2: Your information
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_2"> <div class="collapse in" id="review_step_2">
<div> <div>
@ -61,7 +61,7 @@
Step 3: Your spouse Step 3: Your spouse
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_3"> <div class="collapse in" id="review_step_3">
<div> <div>
@ -76,7 +76,7 @@
Step 4: Your marriage Step 4: Your marriage
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_4"> <div class="collapse in" id="review_step_4">
<div> <div>
@ -91,7 +91,7 @@
Step 5: Your separation Step 5: Your separation
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_5"> <div class="collapse in" id="review_step_5">
<div> <div>
@ -107,7 +107,7 @@
Step 6: Spousal support Step 6: Spousal support
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_6"> <div class="collapse in" id="review_step_6">
<div> <div>
@ -124,7 +124,7 @@
Step {% step_order step="property" %}: Property and debt Step {% step_order step="property" %}: Property and debt
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_7"> <div class="collapse in" id="review_step_7">
<div> <div>
@ -141,7 +141,7 @@
Step {% step_order step="other_orders" %}: Other orders Step {% step_order step="other_orders" %}: Other orders
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_8"> <div class="collapse in" id="review_step_8">
<div> <div>
@ -157,7 +157,7 @@
Step {% step_order step="other_questions" %}: Other questions Step {% step_order step="other_questions" %}: Other questions
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_9"> <div class="collapse in" id="review_step_9">
<div> <div>
@ -172,7 +172,7 @@
Step {% step_order step="location" %}: Filing location Step {% step_order step="location" %}: Filing location
</div> </div>
</div> </div>
<p class="review-butons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_10"> <div class="collapse in" id="review_step_10">
<div> <div>
@ -215,4 +215,4 @@
{% block sidebar %} {% block sidebar %}
<!-- no sidebar --> <!-- no sidebar -->
{% endblock %}
{% endblock %}

+ 2
- 1
edivorce/settings/base.py View File

@ -43,7 +43,8 @@ INSTALLED_APPS = (
'debug_toolbar', 'debug_toolbar',
'edivorce.apps.core', 'edivorce.apps.core',
'compressor', 'compressor',
'crispy_forms'
'crispy_forms',
'sass_processor',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (


+ 2
- 0
edivorce/settings/local.py View File

@ -20,3 +20,5 @@ WEASYPRINT_CSS_LOOPBACK = 'http://10.200.10.1:8000'
DEPLOYMENT_TYPE = 'localdev' DEPLOYMENT_TYPE = 'localdev'
REGISTER_URL = '#' REGISTER_URL = '#'
PROXY_BASE_URL = '' PROXY_BASE_URL = ''
SASS_PROCESSOR_ENABLED = True
SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static'

Write Preview
Loading…
Cancel
Save