Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issues ] front end release issues #888

Merged
merged 3 commits into from
Oct 26, 2023
Merged

[issues ] front end release issues #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b11c68c
assets/base: restyle hr as BO styles break in safari fixes #879
philli-m Oct 26, 2023
aa4508f
settings/dev: update csp to include BO js on older browsers and updag…
philli-m Oct 26, 2023
e5587c9
templates/search_results: update string for search results fixes #853
philli-m Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/879.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Fixed

- restyle hr tag as BO styles break in safari fixes #879
- add BO js urls to script_src for older browsers and add upgrade requests config fixes #844
- change string on search results page fixes #853
6 changes: 6 additions & 0 deletions digitalstrategie/assets/scss/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,9 @@ h5 {
h1 {
margin-bottom: 0.9em !important; // all h1 have same spacing as landing page
}

// fix for safari break on shorthand border with issue #879
hr {
border: none;
border-bottom: 1px solid $gray;
}
9 changes: 8 additions & 1 deletion digitalstrategie/settings/dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@
# CSP for development (not very strict)
CSP_DEFAULT_SRC = ["'self'"]
# unsafe-eval only for testing
CSP_SCRIPT_SRC = ["'unsafe-eval'"]
CSP_SCRIPT_SRC = [
"'unsafe-eval'",
"'self'",
"https://stats.liqd.net",
"https://berlin.de",
"https://www.berlin.de",
]
CSP_SCRIPT_SRC_ATTR = ["'none'"]
# wagtail (and webpack during dev) requires unsafe-inline
CSP_SCRIPT_SRC_ELEM = [
Expand Down Expand Up @@ -111,3 +117,4 @@
CSP_WORKER_SRC = ["'none'"]
CSP_EXCLUDE_URL_PREFIXES = "/admin"
CSP_REPORT_ONLY = False
CSP_UPGRADE_INSECURE_REQUESTS = True
5 changes: 2 additions & 3 deletions digitalstrategie/templates/search_results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ <h2 class="title">
<p>
{% blocktranslate with search_term=request.GET.q %}Search for "{{ search_term }}".{% endblocktranslate %}
{% blocktranslate count counter=object_list|length %}
{{ counter }} measure.
{{ counter }} result.
{% plural %}
{{ counter }} measures.
{{ counter }} results.
{% endblocktranslate %}
</p>
{% for result in object_list %}
Expand Down Expand Up @@ -83,4 +83,3 @@ <h2 class="title">
{% endif %}
</div>
{% endblock %}