Skip to content

Commit c5f122e

Browse files
authored
Merge branch 'master' into feature/backport-workflow
2 parents 867c723 + 3ffe032 commit c5f122e

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

django_loci/static/django-loci/css/loci.css

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ input[type="text"] {
4141
width: 320px;
4242
}
4343
/* simulate required fields */
44-
.coords.loci label {
45-
font-weight: bold;
44+
.coords.loci .flex-container > label {
45+
font-weight: bold !important;
4646
color: #333;
4747
}
4848
.no-location {
@@ -54,6 +54,27 @@ input[type="text"] {
5454
.form-row.field-geometry .flex-container {
5555
display: block;
5656
}
57+
/* Ensures Layer Control labels in Leaflet are not stretched horizontally */
58+
.form-row .leaflet-control label {
59+
min-width: 0;
60+
width: auto;
61+
display: inline-block;
62+
}
63+
.form-row .leaflet-control label:last-child {
64+
padding-right: 0;
65+
}
66+
.form-row .leaflet-control input[type="radio"] {
67+
margin-top: -6px;
68+
}
69+
.form-row .leaflet-control-layers-expanded {
70+
padding: 6px 12px;
71+
}
72+
/* adjust label width for geometry field */
73+
.form-row.field-geometry label,
74+
.field-geometry.form-row label {
75+
min-width: auto;
76+
width: auto;
77+
}
5778
#floorplan_set-group {
5879
display: none;
5980
}

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
django>=4.2.0,<5.3.0
22
django-leaflet~=0.33.0
3-
Pillow~=12.0.0
3+
Pillow~=12.1.0
44
geopy~=2.4.1
55
openwisp-utils[channels] @ https://github.com/openwisp/openwisp-utils/archive/refs/heads/1.3.tar.gz

0 commit comments

Comments
 (0)