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

Fix the title alignment on the index page #41

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Fix the title alignment on the index page #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad017fd
Fix position of app title
chiatt Nov 1, 2024
b82b4fa
Remove cruft
chiatt Nov 2, 2024
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
48 changes: 0 additions & 48 deletions disco/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,54 +469,6 @@

X_FRAME_OPTIONS = "SAMEORIGIN"

FORMATS = [
{
"name": "Bruker M6 (point)",
"id": "bm6",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Bruker 5g",
"id": "b5g",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Bruker Tracer IV-V",
"id": "bt45",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Bruker Tracer III",
"id": "bt3",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Bruker 5i",
"id": "b5i",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Bruker Artax",
"id": "bart",
"renderer": "31be40ae-dbe6-4f41-9c13-1964d7d17042",
},
{
"name": "Renishaw InVia - 785",
"id": "r785",
"renderer": "94fa1720-6773-4f99-b49b-4ea0926b3933",
},
{
"name": "Ranishsaw inVia - 633/514",
"id": "r633",
"renderer": "94fa1720-6773-4f99-b49b-4ea0926b3933",
},
{
"name": "ASD FieldSpec IV hi res",
"id": "asd",
"renderer": "88dccb59-14e3-4445-8f1b-07f0470b38bb",
},
]

XY_TEXT_FILE_FORMATS = ["dx", "txt"]

try:
Expand Down
4 changes: 2 additions & 2 deletions disco/templates/index.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<span class="icon-bar"></span>
</button>

<div class="relative" style="padding-left: 85px; width: 300px;">
<div class="relative" style="margin-left: 85px; width: 245px;">
<div class="navbar-brand-v5-icon-container" style="top: 4px; height: 45px; width: 45px; background: #f9f9f9; border-radius: 50%; border: 1px solid #000;">
<img class="navbar-brand-v5-icon" style="margin-top: -2px;" src="{% webpack_static 'img/landing/arches_logo_dark.png' %}" alt="Arches Logo">
</div>
<div class="application-name" style="position: absolute; top: 5px; left: 150px;">
<h2 style="color: #f4f4f4;">{% trans "Arches/DISCO" %}</h2>
<div style="font-size: 1.3rem; color: #f4f4f4;">{% trans "Arches/DISCO" %}</div>
</div>
</div>
</div>
Expand Down