Skip to content

Commit

Permalink
Merge pull request #1062 from nationalarchives/renovate/riverside-hea…
Browse files Browse the repository at this point in the history
…lthcare-djlint-1.x

Update pre-commit hook Riverside-Healthcare/djLint to v1.31.1
  • Loading branch information
jacksonj04 authored Jul 12, 2023
2 parents 68822b0 + 017a394 commit 4d6e962
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repos:
args: ["--config=setup.cfg"]

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.19.17
rev: v1.31.1
hooks:
- id: djlint-django
name: djLint Reformatting for Django
Expand All @@ -36,7 +36,7 @@ repos:
language: python

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.19.17
rev: v1.31.1
hooks:
- id: djlint-django
name: djLint Checks for Django
Expand Down
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/account/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% trans "Sign In" %}</h1>
{% if redirect_field_value %}
<input type="hidden"
name="{{ redirect_field_name }}"
value="{{ redirect_field_value }}"/>
value="{{ redirect_field_value }}" />
{% endif %}
<a class="button secondaryAction"
href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h2 class="search-component__header--sr-only">Search by keyword or neutral citat
name="query"
type="search"
value=""
placeholder="Enter a keyword or neutral citation"/>
placeholder="Enter a keyword or neutral citation" />
{{ form.search_term }}
<input type="submit" value="Search" />
<div>
Expand Down
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/includes/breadcrumbs.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 448 512">
<!--! Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
<path d="M176 196.8c0 20.7-5.8 41-16.6 58.7L119.7 320H328.3l-39.7-64.5c-10.9-17.7-16.6-38-16.6-58.7V48H176V196.8zM320 48V196.8c0 11.8 3.3 23.5 9.5 33.5L437.7 406.2c6.7 10.9 10.3 23.5 10.3 36.4c0 38.3-31.1 69.4-69.4 69.4H69.4C31.1 512 0 480.9 0 442.6c0-12.8 3.6-25.4 10.3-36.4L118.5 230.4c6.2-10.1 9.5-21.7 9.5-33.5V48h-8c-13.3 0-24-10.7-24-24s10.7-24 24-24h40H288h40c13.3 0 24 10.7 24 24s-10.7 24-24 24h-8z"/>
<path d="M176 196.8c0 20.7-5.8 41-16.6 58.7L119.7 320H328.3l-39.7-64.5c-10.9-17.7-16.6-38-16.6-58.7V48H176V196.8zM320 48V196.8c0 11.8 3.3 23.5 9.5 33.5L437.7 406.2c6.7 10.9 10.3 23.5 10.3 36.4c0 38.3-31.1 69.4-69.4 69.4H69.4C31.1 512 0 480.9 0 442.6c0-12.8 3.6-25.4 10.3-36.4L118.5 230.4c6.2-10.1 9.5-21.7 9.5-33.5V48h-8c-13.3 0-24-10.7-24-24s10.7-24 24-24h40H288h40c13.3 0 24 10.7 24 24s-10.7 24-24 24h-8z" />
</svg>
Labs
</a>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class="metadata-component__neutral_citation-input"
value="{{ judgment.neutral_citation }}"
name="neutral_citation"
id="neutral_citation"/>
id="neutral_citation" />
</div>
<div class="metadata-component__court">
<label for="court" class="metadata-component__main-labels">{% translate "judgment.court" %}</label>
Expand All @@ -24,7 +24,7 @@
value="{{ judgment.court }}"
name="court"
id="court"
list="court-ids"/>
list="court-ids" />
<datalist id="court-ids">
{% for court in courts %}<option value="{{ court.code }}">{{ court.name }}</option>{% endfor %}
</datalist>
Expand All @@ -35,7 +35,7 @@
class="metadata-component__judgment_date-input"
value="{{ judgment.judgment_date_as_string }}"
name="judgment_date"
id="judgment_date"/>
id="judgment_date" />
</div>
</div>
<div class="metadata-component__container">
Expand All @@ -54,8 +54,8 @@
<p>{{ judgment.consignment_reference }}</p>
</div>
<div class="metadata-component__actions">
<input type="hidden" name="judgment_uri" value="{{ judgment_uri }}"/>
<input type="submit" value="Save"/>
<input type="hidden" name="judgment_uri" value="{{ judgment_uri }}" />
<input type="submit" value="Save" />
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ <h4>{% translate "judgments.sidebar.assigned_to" %}</h4>
class="button-cta"
name="assign"
value
{% translate "judgment.assign_cta" %}/>
{% translate "judgment.assign_cta" %} />
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<input type="submit"
name="assign"
class="button-secondary judgment-toolbar__delete"
value="{% translate "judgment.toolbar.delete" %}"/>
value="{% translate "judgment.toolbar.delete" %}" />
</form>
{% endif %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<input aria-label="sort unpublished judgments"
type="submit"
value="Go"
class="judgments-list-controls__button"/>
class="judgments-list-controls__button" />
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<input type="hidden" name="judgment_uri" value="{{ item.uri }}" />
<input type="submit"
name="submit"
value="{% if item.metadata.editor_hold == 'true' %}Release{% else %}Hold{% endif %} judgment"/>
value="{% if item.metadata.editor_hold == 'true' %}Release{% else %}Hold{% endif %} judgment" />
</form>
{% endif %}
</span>
Expand All @@ -79,7 +79,7 @@
<input type="submit"
class="judgments-list__action-button"
name="assign"
value="Assign to me"/>
value="Assign to me" />
</form>
{% endif %}
</span>
Expand All @@ -103,7 +103,7 @@
<input type="submit"
class="judgments-list__action-button"
name="assign"
value="Assign to me"/>
value="Assign to me" />
</form>
{% endif %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h4>Primary colours</h4>
<summary>Usage details</summary>
<p>
The <b>Yellow</b> is used as an accent colour to give content emphasis and is used sparingly.
<br/>
<br />
The <b>Almost Black</b> is used for headers and footers mainly to top and tail page layout.
</p>
<p>
Expand Down
4 changes: 2 additions & 2 deletions ds_caselaw_editor_ui/templates/includes/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
id="tab1"
name="tabs-set"
value="1"
{% if selected == 1 %}checked{% endif %}/>
{% if selected == 1 %}checked{% endif %} />
<label for="tab1">
<a href="{{ url1 }}">{{ label1 }}</a>
</label>
Expand All @@ -14,7 +14,7 @@
id="tab2"
name="tabs-set"
value="2"
{% if selected == 2 %}checked{% endif %}/>
{% if selected == 2 %}checked{% endif %} />
<label for="tab2">
<a href="{{ url2 }}">{{ label2 }}</a>
</label>
Expand Down
12 changes: 6 additions & 6 deletions ds_caselaw_editor_ui/templates/judgment/edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h4>{% translate "judgments.sidebar.downloads" %}</h4>
class="edit-component__metadata_name-input"
value="{{ judgment.name }}"
name="metadata_name"
id="metadata_name"/>
id="metadata_name" />
</div>
<div class="edit-component__panel">
<label class="edit-component__text-field-label" for="neutral_citation">
Expand All @@ -40,7 +40,7 @@ <h4>{% translate "judgments.sidebar.downloads" %}</h4>
value="{{ judgment.neutral_citation }}"
name="neutral_citation"
id="neutral_citation"
size="30"/>
size="30" />
</div>
<div class="edit-component__panel">
<label class="edit-component__text-field-label" for="court">{% translate "judgment.court" %}</label>
Expand All @@ -50,7 +50,7 @@ <h4>{% translate "judgments.sidebar.downloads" %}</h4>
name="court"
id="court"
list="court-ids"
size="40"/>
size="40" />
<datalist id="court-ids">
{% for court in courts %}<option value="{{ court.code }}">{{ court.name }}</option>{% endfor %}
</datalist>
Expand All @@ -62,11 +62,11 @@ <h4>{% translate "judgments.sidebar.downloads" %}</h4>
class="edit-component__judgment_date-input"
value="{{ judgment.judgment_date_as_string }}"
name="judgment_date"
id="judgment_date"/>
id="judgment_date" />
</div>
<div class="edit-component__actions">
<input type="hidden" name="judgment_uri" value="{{ judgment_uri }}"/>
<input type="submit" value="Save"/>
<input type="hidden" name="judgment_uri" value="{{ judgment_uri }}" />
<input type="submit" value="Save" />
</div>
</form>
{% if judgment.versions %}
Expand Down
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/judgment/hold.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>{% translate "judgment.put.on.hold" %}</h2>
<input type="hidden" name="hold" value="true" />
<input class="button-cta"
type="submit"
value="{% translate "judgment.hold_this_judgment" %}"/>
value="{% translate "judgment.hold_this_judgment" %}" />
</div>
</form>
{% endblock judgment_content %}
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/judgment/publish.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Publish this document</h2>
<input type="hidden" name="judgment_uri" value="{{ judgment.uri }}" />
<input class="button-cta"
type="submit"
value="{% translate "judgment.publish_this_judgment" %}"/>
value="{% translate "judgment.publish_this_judgment" %}" />
</div>
</form>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/judgment/unhold.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>{% translate "judgment.hold.unhold_title" %}</h2>
<input type="hidden" name="unhold" value="false" />
<input class="button-cta"
type="submit"
value="{% translate "judgment.unhold.unhold_button" %}"/>
value="{% translate "judgment.unhold.unhold_button" %}" />
</div>
</form>
{% endblock judgment_content %}
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/judgment/unpublish.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ <h2>{% translate "judgment.publish.unpublish_title" %}</h2>
{% csrf_token %}
<input type="hidden" name="judgment_uri" value="{{ judgment.uri }}" />
<input type="submit"
value="{% translate "judgment.unpublish.unpublish_button" %}"/>
value="{% translate "judgment.unpublish.unpublish_button" %}" />
</form>
{% endblock judgment_content %}
2 changes: 1 addition & 1 deletion ds_caselaw_editor_ui/templates/layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<link rel="icon" href="{% static 'images/favicons/favicon.png' %}" />
{% block css %}
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&amp;family=Roboto:wght@400;600;700&amp;family=Roboto+Mono:wght@400;600;700&amp;display=swap"
rel="stylesheet"/>
rel="stylesheet" />
<link href="{% static 'css/main.css' %}" rel="stylesheet" />
{% endblock css %}
<script defer src="{% static 'js/dist/app.js' %}"></script>
Expand Down
12 changes: 6 additions & 6 deletions ds_caselaw_editor_ui/templates/pages/style_guide_components.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ <h2>{% translate "style_guide.title" %}</h2>
<p>{% translate "style_guide.description" %}</p>
{% include "includes/tabs.html" with label1="Components" label2="Branding" url1="/style_guide/components" url2="/style_guide/branding" selected=1 %}
{% include "includes/style_guide/buttons.html" %}
<hr/>
<hr />
{% include "includes/style_guide/colours.html" %}
<hr/>
<hr />
{% include "includes/style_guide/tabs.html" %}
<hr/>
<hr />
{% include "includes/style_guide/notification-messaging.html" %}
<hr/>
<hr />
{% include "includes/style_guide/summary-panels.html" %}
<hr/>
<hr />
{% include "includes/style_guide/note.html" %}
<hr/>
<hr />
</div>
{% endblock content %}

0 comments on commit 4d6e962

Please sign in to comment.