diff --git a/babybuddy/static_src/js/tags_editor.js b/babybuddy/static_src/js/tags_editor.js index f0b73e17..8038e579 100644 --- a/babybuddy/static_src/js/tags_editor.js +++ b/babybuddy/static_src/js/tags_editor.js @@ -191,7 +191,7 @@ } /** - * Callback called when the the "Add" button of the add-tag input is + * Callback called when the "Add" button of the add-tag input is * clicked or enter is pressed in the editor. */ onCreateTagClicked() { diff --git a/package-lock.json b/package-lock.json index ec2986bf..73767bd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "license": "BSD-2-Clause", "devDependencies": { "@popperjs/core": "^2.11.8", - "@ronilaukkarinen/gulp-stylelint": "^14.1.1", + "@ronilaukkarinen/gulp-stylelint": "^14.1.2", "bootstrap": "^5.3.2", "del": "^6.1.1", "gulp": "^4.0.2", @@ -26,10 +26,10 @@ "jquery": "^3.7.1", "masonry-layout": "^4.2.2", "npm-force-resolutions": "^0.0.10", - "plotly.js": "^2.27.0", + "plotly.js": "^2.28.0", "pulltorefreshjs": "^0.1.22", "pump": "^3.0.0", - "sass": "^1.69.4", + "sass": "^1.70.0", "stylelint": "^15.11.0", "stylelint-config-recommended-scss": "^13.0.0", "stylelint-order": "^6.0.3", @@ -378,6 +378,39 @@ "elementary-circuits-directed-graph": "^1.0.4" } }, + "node_modules/@plotly/mapbox-gl": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz", + "integrity": "sha512-sR3/Pe5LqT/fhYgp4rT4aSFf1rTsxMbGiH6Hojc7PH36ny5Bn17iVFUjpzycafETURuFbLZUfjODO8LvSI+5zQ==", + "dev": true, + "dependencies": { + "@mapbox/geojson-rewind": "^0.5.2", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.5.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.1", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.3", + "earcut": "^2.2.2", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.2.1", + "grid-index": "^1.1.0", + "murmurhash-js": "^1.0.0", + "pbf": "^3.2.1", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^7.1.0", + "tinyqueue": "^2.0.3", + "vt-pbf": "^3.1.1" + }, + "engines": { + "node": ">=6.4.0" + } + }, "node_modules/@plotly/point-cluster": { "version": "3.1.9", "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", @@ -407,9 +440,9 @@ } }, "node_modules/@ronilaukkarinen/gulp-stylelint": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/@ronilaukkarinen/gulp-stylelint/-/gulp-stylelint-14.1.1.tgz", - "integrity": "sha512-3gXiYu0PkPTXs7l70V6zrHCy9O1KziMTKy9fcDho2KXiAxUcFeBaZ8Gw6Sz46Rj5vJTXMgrVd4fAoRHfxO3tBQ==", + "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@ronilaukkarinen/gulp-stylelint/-/gulp-stylelint-14.1.2.tgz", + "integrity": "sha512-Ckg2cD1MVWBJTq8Yp6uxCLB5DtDrhybl1RfOAGv9QodxIF5Bk5OgRhfEkue2do23oYq5147VdATPgd5n4ShV8Q==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", @@ -1176,6 +1209,15 @@ "node": ">=0.10.0" } }, + "node_modules/base64-arraybuffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", + "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/beeper": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", @@ -5599,12 +5641,13 @@ } }, "node_modules/mapbox-gl": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.10.1.tgz", - "integrity": "sha512-0aHt+lFUpYfvh0kMIqXqNXqoYMuhuAsMlw87TbhWrw78Tx2zfuPI0Lx31/YPUgJ+Ire0tzQ4JnuBL7acDNXmMg==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.3.tgz", + "integrity": "sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==", "dev": true, + "peer": true, "dependencies": { - "@mapbox/geojson-rewind": "^0.5.0", + "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/geojson-types": "^1.0.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", "@mapbox/mapbox-gl-supported": "^1.5.0", @@ -5618,13 +5661,12 @@ "geojson-vt": "^3.2.1", "gl-matrix": "^3.2.1", "grid-index": "^1.1.0", - "minimist": "^1.2.5", "murmurhash-js": "^1.0.0", "pbf": "^3.2.1", "potpack": "^1.0.1", "quickselect": "^2.0.0", "rw": "^1.3.3", - "supercluster": "^7.0.0", + "supercluster": "^7.1.0", "tinyqueue": "^2.0.3", "vt-pbf": "^3.1.1" }, @@ -6851,17 +6893,19 @@ } }, "node_modules/plotly.js": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/plotly.js/-/plotly.js-2.27.0.tgz", - "integrity": "sha512-48LjCf+A7MmgNTPBBomYdIcFaY/oWjIdRT7k+qmXz9opcMCAJiBrpbslWyfmR8HwmTxJRGdeyoWWlO8AHkvq5A==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/plotly.js/-/plotly.js-2.28.0.tgz", + "integrity": "sha512-fEvAapXhFTFO/PM5LnUvoG+tgOxRjjW7C7nHwVaDLKfq0F+SF/p3zRgo7vKwk9588WfgEHvuk6yRnp1mxZ+YSw==", "dev": true, "dependencies": { "@plotly/d3": "3.8.1", "@plotly/d3-sankey": "0.7.2", "@plotly/d3-sankey-circular": "0.33.1", + "@plotly/mapbox-gl": "v1.13.4", "@turf/area": "^6.4.0", "@turf/bbox": "^6.4.0", "@turf/centroid": "^6.0.2", + "base64-arraybuffer": "^1.0.2", "canvas-fit": "^1.5.0", "color-alpha": "1.0.4", "color-normalize": "1.5.0", @@ -6883,7 +6927,6 @@ "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", "is-mobile": "^4.0.0", - "mapbox-gl": "1.10.1", "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.2.0", @@ -6895,7 +6938,7 @@ "regl": "npm:@plotly/regl@^2.1.2", "regl-error2d": "^2.0.12", "regl-line2d": "^3.1.2", - "regl-scatter2d": "^3.2.9", + "regl-scatter2d": "^3.3.1", "regl-splom": "^1.0.14", "strongly-connected-components": "^1.0.1", "superscript-text": "^1.0.0", @@ -7649,9 +7692,9 @@ } }, "node_modules/regl-scatter2d": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.9.tgz", - "integrity": "sha512-PNrXs+xaCClKpiB2b3HZ2j3qXQXhC5kcTh/Nfgx9rLO0EpEhab0BSQDqAsbdbpdf+pSHSJvbgitB7ulbGeQ+Fg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.3.1.tgz", + "integrity": "sha512-seOmMIVwaCwemSYz/y4WE0dbSO9svNFSqtTh5RE57I7PjGo3tcUYKtH0MTSoshcAsreoqN8HoCtnn8wfHXXfKQ==", "dev": true, "dependencies": { "@plotly/point-cluster": "^3.1.9", @@ -7972,9 +8015,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.69.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz", - "integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==", + "version": "1.70.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz", + "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index 0254ec5f..79b072a2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "@popperjs/core": "^2.11.8", - "@ronilaukkarinen/gulp-stylelint": "^14.1.1", + "@ronilaukkarinen/gulp-stylelint": "^14.1.2", "bootstrap": "^5.3.2", "del": "^6.1.1", "gulp": "^4.0.2", @@ -26,10 +26,10 @@ "jquery": "^3.7.1", "masonry-layout": "^4.2.2", "npm-force-resolutions": "^0.0.10", - "plotly.js": "^2.27.0", + "plotly.js": "^2.28.0", "pulltorefreshjs": "^0.1.22", "pump": "^3.0.0", - "sass": "^1.69.4", + "sass": "^1.70.0", "stylelint": "^15.11.0", "stylelint-config-recommended-scss": "^13.0.0", "stylelint-order": "^6.0.3", diff --git a/static/admin/css/base.64976e0f7339.css.gz b/static/admin/css/base.64976e0f7339.css.gz deleted file mode 100644 index e8dc2686..00000000 Binary files a/static/admin/css/base.64976e0f7339.css.gz and /dev/null differ diff --git a/static/admin/css/base.64976e0f7339.css b/static/admin/css/base.6be58084bde8.css similarity index 96% rename from static/admin/css/base.64976e0f7339.css rename to static/admin/css/base.6be58084bde8.css index 456af38a..0683419c 100644 --- a/static/admin/css/base.64976e0f7339.css +++ b/static/admin/css/base.6be58084bde8.css @@ -22,11 +22,11 @@ html[data-theme="light"], --breadcrumbs-fg: #c4dce8; --breadcrumbs-link-fg: var(--body-bg); - --breadcrumbs-bg: var(--primary); + --breadcrumbs-bg: #264b5d; --link-fg: #417893; --link-hover-color: #036; - --link-selected-fg: #5b80b2; + --link-selected-fg: var(--secondary); --hairline-color: #e8e8e8; --border-color: #ccc; @@ -42,10 +42,10 @@ html[data-theme="light"], --selected-row: #ffc; --button-fg: #fff; - --button-bg: var(--primary); - --button-hover-bg: #609ab6; - --default-button-bg: var(--secondary); - --default-button-hover-bg: #205067; + --button-bg: var(--secondary); + --button-hover-bg: #205067; + --default-button-bg: #205067; + --default-button-hover-bg: var(--secondary); --close-button-bg: #747474; --close-button-hover-bg: #333; --delete-button-bg: #ba2121; @@ -56,8 +56,6 @@ html[data-theme="light"], --object-tools-hover-bg: var(--close-button-hover-bg); --font-family-primary: - -apple-system, - BlinkMacSystemFont, "Segoe UI", system-ui, Roboto, @@ -104,7 +102,7 @@ body { /* LINKS */ a:link, a:visited { - color: var(--link-fg); + color: var(--body-fg); text-decoration: none; transition: color 0.15s, background 0.15s; } @@ -586,7 +584,7 @@ input[type=button][disabled].default { font-weight: 400; font-size: 0.8125rem; text-align: left; - background: var(--primary); + background: var(--header-bg); color: var(--header-link-color); } @@ -722,6 +720,11 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover { background: url("../img/icon-viewlink.41eb31f7826e.svg") 0 1px no-repeat; } +.hidelink { + padding-left: 16px; + background: url("../img/icon-hidelink.8d245a995e18.svg") 0 1px no-repeat; +} + .addlink { padding-left: 16px; background: url("../img/icon-addlink.d519b3bab011.svg") 0 1px no-repeat; @@ -831,10 +834,6 @@ a.deletelink:focus, a.deletelink:hover { height: 100%; } -#container > div { - flex-shrink: 0; -} - #container > .main { display: flex; flex: 1 0 auto; @@ -919,7 +918,6 @@ a.deletelink:focus, a.deletelink:hover { padding: 10px 40px; background: var(--header-bg); color: var(--header-color); - overflow: hidden; } #header a:link, #header a:visited, #logout-form button { @@ -934,7 +932,7 @@ a.deletelink:focus, a.deletelink:hover { display: flex; } -#branding h1 { +#site-name { padding: 0; margin: 0; margin-inline-end: 20px; @@ -943,7 +941,7 @@ a.deletelink:focus, a.deletelink:hover { color: var(--header-branding-color); } -#branding h1 a:link, #branding h1 a:visited { +#site-name a:link, #site-name a:visited { color: var(--accent); } @@ -1090,6 +1088,9 @@ a.deletelink:focus, a.deletelink:hover { /* PAGINATOR */ .paginator { + display: flex; + align-items: center; + gap: 4px; font-size: 0.8125rem; padding-top: 10px; padding-bottom: 10px; @@ -1133,6 +1134,23 @@ a.deletelink:focus, a.deletelink:hover { background: var(--link-hover-color); } +.paginator input { + margin-left: auto; +} + .base-svgs { display: none; } + +.visually-hidden { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0,0,0,0); + white-space: nowrap; + border: 0; + color: var(--body-fg); + background-color: var(--body-bg); +} diff --git a/static/admin/css/base.6be58084bde8.css.gz b/static/admin/css/base.6be58084bde8.css.gz new file mode 100644 index 00000000..a377ed58 Binary files /dev/null and b/static/admin/css/base.6be58084bde8.css.gz differ diff --git a/static/admin/css/base.css b/static/admin/css/base.css index 72f4ae16..8a2837a5 100644 --- a/static/admin/css/base.css +++ b/static/admin/css/base.css @@ -22,11 +22,11 @@ html[data-theme="light"], --breadcrumbs-fg: #c4dce8; --breadcrumbs-link-fg: var(--body-bg); - --breadcrumbs-bg: var(--primary); + --breadcrumbs-bg: #264b5d; --link-fg: #417893; --link-hover-color: #036; - --link-selected-fg: #5b80b2; + --link-selected-fg: var(--secondary); --hairline-color: #e8e8e8; --border-color: #ccc; @@ -42,10 +42,10 @@ html[data-theme="light"], --selected-row: #ffc; --button-fg: #fff; - --button-bg: var(--primary); - --button-hover-bg: #609ab6; - --default-button-bg: var(--secondary); - --default-button-hover-bg: #205067; + --button-bg: var(--secondary); + --button-hover-bg: #205067; + --default-button-bg: #205067; + --default-button-hover-bg: var(--secondary); --close-button-bg: #747474; --close-button-hover-bg: #333; --delete-button-bg: #ba2121; @@ -56,8 +56,6 @@ html[data-theme="light"], --object-tools-hover-bg: var(--close-button-hover-bg); --font-family-primary: - -apple-system, - BlinkMacSystemFont, "Segoe UI", system-ui, Roboto, @@ -104,7 +102,7 @@ body { /* LINKS */ a:link, a:visited { - color: var(--link-fg); + color: var(--body-fg); text-decoration: none; transition: color 0.15s, background 0.15s; } @@ -586,7 +584,7 @@ input[type=button][disabled].default { font-weight: 400; font-size: 0.8125rem; text-align: left; - background: var(--primary); + background: var(--header-bg); color: var(--header-link-color); } @@ -722,6 +720,11 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover { background: url(../img/icon-viewlink.svg) 0 1px no-repeat; } +.hidelink { + padding-left: 16px; + background: url(../img/icon-hidelink.svg) 0 1px no-repeat; +} + .addlink { padding-left: 16px; background: url(../img/icon-addlink.svg) 0 1px no-repeat; @@ -831,10 +834,6 @@ a.deletelink:focus, a.deletelink:hover { height: 100%; } -#container > div { - flex-shrink: 0; -} - #container > .main { display: flex; flex: 1 0 auto; @@ -919,7 +918,6 @@ a.deletelink:focus, a.deletelink:hover { padding: 10px 40px; background: var(--header-bg); color: var(--header-color); - overflow: hidden; } #header a:link, #header a:visited, #logout-form button { @@ -934,7 +932,7 @@ a.deletelink:focus, a.deletelink:hover { display: flex; } -#branding h1 { +#site-name { padding: 0; margin: 0; margin-inline-end: 20px; @@ -943,7 +941,7 @@ a.deletelink:focus, a.deletelink:hover { color: var(--header-branding-color); } -#branding h1 a:link, #branding h1 a:visited { +#site-name a:link, #site-name a:visited { color: var(--accent); } @@ -1090,6 +1088,9 @@ a.deletelink:focus, a.deletelink:hover { /* PAGINATOR */ .paginator { + display: flex; + align-items: center; + gap: 4px; font-size: 0.8125rem; padding-top: 10px; padding-bottom: 10px; @@ -1133,6 +1134,23 @@ a.deletelink:focus, a.deletelink:hover { background: var(--link-hover-color); } +.paginator input { + margin-left: auto; +} + .base-svgs { display: none; } + +.visually-hidden { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0,0,0,0); + white-space: nowrap; + border: 0; + color: var(--body-fg); + background-color: var(--body-bg); +} diff --git a/static/admin/css/base.css.gz b/static/admin/css/base.css.gz index fa107378..ac71d24b 100644 Binary files a/static/admin/css/base.css.gz and b/static/admin/css/base.css.gz differ diff --git a/static/admin/css/changelists.9237a1ac391b.css b/static/admin/css/changelists.47cb433b29d4.css similarity index 95% rename from static/admin/css/changelists.9237a1ac391b.css rename to static/admin/css/changelists.47cb433b29d4.css index a7545131..573c3896 100644 --- a/static/admin/css/changelists.9237a1ac391b.css +++ b/static/admin/css/changelists.47cb433b29d4.css @@ -153,6 +153,7 @@ font-weight: 400; padding: 0 15px; margin-bottom: 10px; + cursor: pointer; } #changelist-filter details summary > * { @@ -215,9 +216,9 @@ color: var(--link-hover-color); } -#changelist-filter #changelist-filter-clear a { +#changelist-filter #changelist-filter-extra-actions { font-size: 0.8125rem; - padding-bottom: 10px; + margin-bottom: 10px; border-bottom: 1px solid var(--hairline-color); } @@ -265,6 +266,15 @@ background-color: var(--selected-row); } +@media (forced-colors: active) { + #changelist tbody tr.selected { + background-color: SelectedItem; + } + #changelist tbody tr:has(.action-select:checked) { + background-color: SelectedItem; + } +} + #changelist .actions { padding: 10px; background: var(--body-bg); diff --git a/static/admin/css/changelists.47cb433b29d4.css.gz b/static/admin/css/changelists.47cb433b29d4.css.gz new file mode 100644 index 00000000..1658ab0b Binary files /dev/null and b/static/admin/css/changelists.47cb433b29d4.css.gz differ diff --git a/static/admin/css/changelists.9237a1ac391b.css.gz b/static/admin/css/changelists.9237a1ac391b.css.gz deleted file mode 100644 index 108028ff..00000000 Binary files a/static/admin/css/changelists.9237a1ac391b.css.gz and /dev/null differ diff --git a/static/admin/css/changelists.css b/static/admin/css/changelists.css index a7545131..573c3896 100644 --- a/static/admin/css/changelists.css +++ b/static/admin/css/changelists.css @@ -153,6 +153,7 @@ font-weight: 400; padding: 0 15px; margin-bottom: 10px; + cursor: pointer; } #changelist-filter details summary > * { @@ -215,9 +216,9 @@ color: var(--link-hover-color); } -#changelist-filter #changelist-filter-clear a { +#changelist-filter #changelist-filter-extra-actions { font-size: 0.8125rem; - padding-bottom: 10px; + margin-bottom: 10px; border-bottom: 1px solid var(--hairline-color); } @@ -265,6 +266,15 @@ background-color: var(--selected-row); } +@media (forced-colors: active) { + #changelist tbody tr.selected { + background-color: SelectedItem; + } + #changelist tbody tr:has(.action-select:checked) { + background-color: SelectedItem; + } +} + #changelist .actions { padding: 10px; background: var(--body-bg); diff --git a/static/admin/css/changelists.css.gz b/static/admin/css/changelists.css.gz index 108028ff..1658ab0b 100644 Binary files a/static/admin/css/changelists.css.gz and b/static/admin/css/changelists.css.gz differ diff --git a/static/admin/css/dark_mode.css b/static/admin/css/dark_mode.css index 6d08233a..c49b6bc2 100644 --- a/static/admin/css/dark_mode.css +++ b/static/admin/css/dark_mode.css @@ -122,16 +122,3 @@ html[data-theme="dark"] .theme-toggle svg.theme-icon-when-dark { html[data-theme="light"] .theme-toggle svg.theme-icon-when-light { display: block; } - -.visually-hidden { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - overflow: hidden; - clip: rect(0,0,0,0); - white-space: nowrap; - border: 0; - color: var(--body-fg); - background-color: var(--body-bg); -} diff --git a/static/admin/css/dark_mode.css.gz b/static/admin/css/dark_mode.css.gz index faebccea..10e4839b 100644 Binary files a/static/admin/css/dark_mode.css.gz and b/static/admin/css/dark_mode.css.gz differ diff --git a/static/admin/css/dark_mode.ef27a31af300.css b/static/admin/css/dark_mode.e18e9a052429.css similarity index 91% rename from static/admin/css/dark_mode.ef27a31af300.css rename to static/admin/css/dark_mode.e18e9a052429.css index 6d08233a..c49b6bc2 100644 --- a/static/admin/css/dark_mode.ef27a31af300.css +++ b/static/admin/css/dark_mode.e18e9a052429.css @@ -122,16 +122,3 @@ html[data-theme="dark"] .theme-toggle svg.theme-icon-when-dark { html[data-theme="light"] .theme-toggle svg.theme-icon-when-light { display: block; } - -.visually-hidden { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - overflow: hidden; - clip: rect(0,0,0,0); - white-space: nowrap; - border: 0; - color: var(--body-fg); - background-color: var(--body-bg); -} diff --git a/static/admin/css/dark_mode.e18e9a052429.css.gz b/static/admin/css/dark_mode.e18e9a052429.css.gz new file mode 100644 index 00000000..10e4839b Binary files /dev/null and b/static/admin/css/dark_mode.e18e9a052429.css.gz differ diff --git a/static/admin/css/dark_mode.ef27a31af300.css.gz b/static/admin/css/dark_mode.ef27a31af300.css.gz deleted file mode 100644 index faebccea..00000000 Binary files a/static/admin/css/dark_mode.ef27a31af300.css.gz and /dev/null differ diff --git a/static/admin/css/forms.3b181cba6653.css.gz b/static/admin/css/forms.3b181cba6653.css.gz deleted file mode 100644 index 107139e0..00000000 Binary files a/static/admin/css/forms.3b181cba6653.css.gz and /dev/null differ diff --git a/static/admin/css/forms.3b181cba6653.css b/static/admin/css/forms.b29a0c8c9155.css similarity index 99% rename from static/admin/css/forms.3b181cba6653.css rename to static/admin/css/forms.b29a0c8c9155.css index 1f269972..eb2c2945 100644 --- a/static/admin/css/forms.3b181cba6653.css +++ b/static/admin/css/forms.b29a0c8c9155.css @@ -1,4 +1,4 @@ -@import url("widgets.0a3765e806b3.css"); +@import url("widgets.8a70ea6d8850.css"); /* FORM ROWS */ @@ -24,6 +24,9 @@ form .form-row p { .flex-container { display: flex; +} + +.form-multiline { flex-wrap: wrap; } @@ -78,6 +81,7 @@ form ul.inline li { .aligned label { display: block; padding: 4px 10px 0 0; + min-width: 160px; width: 160px; word-wrap: break-word; line-height: 1; diff --git a/static/admin/css/forms.b29a0c8c9155.css.gz b/static/admin/css/forms.b29a0c8c9155.css.gz new file mode 100644 index 00000000..e3c930f0 Binary files /dev/null and b/static/admin/css/forms.b29a0c8c9155.css.gz differ diff --git a/static/admin/css/forms.css b/static/admin/css/forms.css index e45abe1c..9a8dad08 100644 --- a/static/admin/css/forms.css +++ b/static/admin/css/forms.css @@ -24,6 +24,9 @@ form .form-row p { .flex-container { display: flex; +} + +.form-multiline { flex-wrap: wrap; } @@ -78,6 +81,7 @@ form ul.inline li { .aligned label { display: block; padding: 4px 10px 0 0; + min-width: 160px; width: 160px; word-wrap: break-word; line-height: 1; diff --git a/static/admin/css/forms.css.gz b/static/admin/css/forms.css.gz index ed254361..da29e869 100644 Binary files a/static/admin/css/forms.css.gz and b/static/admin/css/forms.css.gz differ diff --git a/static/admin/css/nav_sidebar.269a1bd44627.css.gz b/static/admin/css/nav_sidebar.269a1bd44627.css.gz deleted file mode 100644 index 7398c4df..00000000 Binary files a/static/admin/css/nav_sidebar.269a1bd44627.css.gz and /dev/null differ diff --git a/static/admin/css/nav_sidebar.css b/static/admin/css/nav_sidebar.css index f76e6ce4..7eb0de97 100644 --- a/static/admin/css/nav_sidebar.css +++ b/static/admin/css/nav_sidebar.css @@ -102,6 +102,12 @@ background: var(--selected-row); } +@media (forced-colors: active) { + #nav-sidebar .current-model { + background-color: SelectedItem; + } +} + .main > #nav-sidebar + .content { max-width: calc(100% - 23px); } diff --git a/static/admin/css/nav_sidebar.css.gz b/static/admin/css/nav_sidebar.css.gz index 7398c4df..bb01234e 100644 Binary files a/static/admin/css/nav_sidebar.css.gz and b/static/admin/css/nav_sidebar.css.gz differ diff --git a/static/admin/css/nav_sidebar.269a1bd44627.css b/static/admin/css/nav_sidebar.dd925738f4cc.css similarity index 95% rename from static/admin/css/nav_sidebar.269a1bd44627.css rename to static/admin/css/nav_sidebar.dd925738f4cc.css index f76e6ce4..7eb0de97 100644 --- a/static/admin/css/nav_sidebar.269a1bd44627.css +++ b/static/admin/css/nav_sidebar.dd925738f4cc.css @@ -102,6 +102,12 @@ background: var(--selected-row); } +@media (forced-colors: active) { + #nav-sidebar .current-model { + background-color: SelectedItem; + } +} + .main > #nav-sidebar + .content { max-width: calc(100% - 23px); } diff --git a/static/admin/css/nav_sidebar.dd925738f4cc.css.gz b/static/admin/css/nav_sidebar.dd925738f4cc.css.gz new file mode 100644 index 00000000..bb01234e Binary files /dev/null and b/static/admin/css/nav_sidebar.dd925738f4cc.css.gz differ diff --git a/static/admin/css/responsive.107cd2690311.css.gz b/static/admin/css/responsive.107cd2690311.css.gz deleted file mode 100644 index 7e8070e4..00000000 Binary files a/static/admin/css/responsive.107cd2690311.css.gz and /dev/null differ diff --git a/static/admin/css/responsive.css b/static/admin/css/responsive.css index 9ce4f67b..bb539456 100644 --- a/static/admin/css/responsive.css +++ b/static/admin/css/responsive.css @@ -43,7 +43,7 @@ input[type="submit"], button { justify-content: flex-start; } - #branding h1 { + #site-name { margin: 0 0 8px; line-height: 1.2; } @@ -237,22 +237,6 @@ input[type="submit"], button { padding: 7px; } - /* Related widget */ - - .related-widget-wrapper { - float: none; - } - - .related-widget-wrapper-link + .selector { - max-width: calc(100% - 30px); - margin-right: 15px; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 10px; - } - /* Selector */ .selector { @@ -270,7 +254,7 @@ input[type="submit"], button { } .selector .selector-filter input { - width: auto; + width: 100%; min-height: 0; flex: 1 1; } @@ -292,7 +276,6 @@ input[type="submit"], button { width: 26px; height: 52px; padding: 2px 0; - margin: auto 15px; border-radius: 20px; transform: translateY(-10px); } @@ -336,7 +319,6 @@ input[type="submit"], button { width: 52px; height: 26px; padding: 0 2px; - margin: 15px auto; transform: none; } @@ -432,7 +414,7 @@ input[type="submit"], button { padding: 15px 20px; } - .login #branding h1 { + .login #site-name { margin: 0; } @@ -565,6 +547,10 @@ input[type="submit"], button { flex-flow: column; } + .flex-container.checkbox-row { + flex-flow: row; + } + textarea { max-width: none; } @@ -584,6 +570,7 @@ input[type="submit"], button { .aligned label { width: 100%; + min-width: auto; padding: 0 0 10px; } @@ -598,10 +585,6 @@ input[type="submit"], button { max-width: 100%; } - .aligned .checkbox-row { - align-items: center; - } - .aligned .checkbox-row input { flex: 0 1 auto; margin: 0; @@ -683,23 +666,14 @@ input[type="submit"], button { align-self: center; } - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 15px; - } - /* Selector */ .selector { flex-direction: column; - } - - .selector > * { - float: none; + gap: 10px 0; } .selector-available, .selector-chosen { - margin-bottom: 0; flex: 1 1 auto; } @@ -709,11 +683,9 @@ input[type="submit"], button { .selector ul.selector-chooser { display: block; - float: none; width: 52px; height: 26px; padding: 0 2px; - margin: 15px auto 20px; transform: none; } diff --git a/static/admin/css/responsive.css.gz b/static/admin/css/responsive.css.gz index 7e8070e4..eeba5c4a 100644 Binary files a/static/admin/css/responsive.css.gz and b/static/admin/css/responsive.css.gz differ diff --git a/static/admin/css/responsive.107cd2690311.css b/static/admin/css/responsive.eafb93ff084c.css similarity index 95% rename from static/admin/css/responsive.107cd2690311.css rename to static/admin/css/responsive.eafb93ff084c.css index 9ce4f67b..bb539456 100644 --- a/static/admin/css/responsive.107cd2690311.css +++ b/static/admin/css/responsive.eafb93ff084c.css @@ -43,7 +43,7 @@ input[type="submit"], button { justify-content: flex-start; } - #branding h1 { + #site-name { margin: 0 0 8px; line-height: 1.2; } @@ -237,22 +237,6 @@ input[type="submit"], button { padding: 7px; } - /* Related widget */ - - .related-widget-wrapper { - float: none; - } - - .related-widget-wrapper-link + .selector { - max-width: calc(100% - 30px); - margin-right: 15px; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 10px; - } - /* Selector */ .selector { @@ -270,7 +254,7 @@ input[type="submit"], button { } .selector .selector-filter input { - width: auto; + width: 100%; min-height: 0; flex: 1 1; } @@ -292,7 +276,6 @@ input[type="submit"], button { width: 26px; height: 52px; padding: 2px 0; - margin: auto 15px; border-radius: 20px; transform: translateY(-10px); } @@ -336,7 +319,6 @@ input[type="submit"], button { width: 52px; height: 26px; padding: 0 2px; - margin: 15px auto; transform: none; } @@ -432,7 +414,7 @@ input[type="submit"], button { padding: 15px 20px; } - .login #branding h1 { + .login #site-name { margin: 0; } @@ -565,6 +547,10 @@ input[type="submit"], button { flex-flow: column; } + .flex-container.checkbox-row { + flex-flow: row; + } + textarea { max-width: none; } @@ -584,6 +570,7 @@ input[type="submit"], button { .aligned label { width: 100%; + min-width: auto; padding: 0 0 10px; } @@ -598,10 +585,6 @@ input[type="submit"], button { max-width: 100%; } - .aligned .checkbox-row { - align-items: center; - } - .aligned .checkbox-row input { flex: 0 1 auto; margin: 0; @@ -683,23 +666,14 @@ input[type="submit"], button { align-self: center; } - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 15px; - } - /* Selector */ .selector { flex-direction: column; - } - - .selector > * { - float: none; + gap: 10px 0; } .selector-available, .selector-chosen { - margin-bottom: 0; flex: 1 1 auto; } @@ -709,11 +683,9 @@ input[type="submit"], button { .selector ul.selector-chooser { display: block; - float: none; width: 52px; height: 26px; padding: 0 2px; - margin: 15px auto 20px; transform: none; } diff --git a/static/admin/css/responsive.eafb93ff084c.css.gz b/static/admin/css/responsive.eafb93ff084c.css.gz new file mode 100644 index 00000000..eeba5c4a Binary files /dev/null and b/static/admin/css/responsive.eafb93ff084c.css.gz differ diff --git a/static/admin/css/responsive_rtl.97b066429fd8.css b/static/admin/css/responsive_rtl.7d1130848605.css similarity index 95% rename from static/admin/css/responsive_rtl.97b066429fd8.css rename to static/admin/css/responsive_rtl.7d1130848605.css index 639e20b2..31dc8ff7 100644 --- a/static/admin/css/responsive_rtl.97b066429fd8.css +++ b/static/admin/css/responsive_rtl.7d1130848605.css @@ -78,4 +78,7 @@ margin-left: 0; margin-right: 0; } + [dir="rtl"] .aligned .vCheckboxLabel { + padding: 1px 5px 0 0; + } } diff --git a/static/admin/css/responsive_rtl.7d1130848605.css.gz b/static/admin/css/responsive_rtl.7d1130848605.css.gz new file mode 100644 index 00000000..3e2886b5 Binary files /dev/null and b/static/admin/css/responsive_rtl.7d1130848605.css.gz differ diff --git a/static/admin/css/responsive_rtl.97b066429fd8.css.gz b/static/admin/css/responsive_rtl.97b066429fd8.css.gz deleted file mode 100644 index 92a5f17f..00000000 Binary files a/static/admin/css/responsive_rtl.97b066429fd8.css.gz and /dev/null differ diff --git a/static/admin/css/responsive_rtl.css b/static/admin/css/responsive_rtl.css index 639e20b2..31dc8ff7 100644 --- a/static/admin/css/responsive_rtl.css +++ b/static/admin/css/responsive_rtl.css @@ -78,4 +78,7 @@ margin-left: 0; margin-right: 0; } + [dir="rtl"] .aligned .vCheckboxLabel { + padding: 1px 5px 0 0; + } } diff --git a/static/admin/css/responsive_rtl.css.gz b/static/admin/css/responsive_rtl.css.gz index 92a5f17f..3e2886b5 100644 Binary files a/static/admin/css/responsive_rtl.css.gz and b/static/admin/css/responsive_rtl.css.gz differ diff --git a/static/admin/css/rtl.4685390ad96d.css.gz b/static/admin/css/rtl.4685390ad96d.css.gz deleted file mode 100644 index 67cea157..00000000 Binary files a/static/admin/css/rtl.4685390ad96d.css.gz and /dev/null differ diff --git a/static/admin/css/rtl.4685390ad96d.css b/static/admin/css/rtl.aa92d763340b.css similarity index 95% rename from static/admin/css/rtl.4685390ad96d.css rename to static/admin/css/rtl.aa92d763340b.css index 298fba87..3a60b90f 100644 --- a/static/admin/css/rtl.4685390ad96d.css +++ b/static/admin/css/rtl.aa92d763340b.css @@ -13,7 +13,7 @@ th { margin-right: 1.5em; } -.viewlink, .addlink, .changelink { +.viewlink, .addlink, .changelink, .hidelink { padding-left: 0; padding-right: 16px; background-position: 100% 1px; @@ -107,6 +107,16 @@ thead th.sorted .text { border-left: none; } +.paginator .end { + margin-left: 6px; + margin-right: 0; +} + +.paginator input { + margin-left: 0; + margin-right: auto; +} + /* FORMS */ .aligned label { @@ -286,3 +296,7 @@ form .form-row p.datetime { margin-left: inherit; margin-right: 2px; } + +.selector .selector-chooser { + margin: 0; +} diff --git a/static/admin/css/rtl.aa92d763340b.css.gz b/static/admin/css/rtl.aa92d763340b.css.gz new file mode 100644 index 00000000..3ede13e0 Binary files /dev/null and b/static/admin/css/rtl.aa92d763340b.css.gz differ diff --git a/static/admin/css/rtl.css b/static/admin/css/rtl.css index 53a6dd6c..9027c7ed 100644 --- a/static/admin/css/rtl.css +++ b/static/admin/css/rtl.css @@ -13,7 +13,7 @@ th { margin-right: 1.5em; } -.viewlink, .addlink, .changelink { +.viewlink, .addlink, .changelink, .hidelink { padding-left: 0; padding-right: 16px; background-position: 100% 1px; @@ -107,6 +107,16 @@ thead th.sorted .text { border-left: none; } +.paginator .end { + margin-left: 6px; + margin-right: 0; +} + +.paginator input { + margin-left: 0; + margin-right: auto; +} + /* FORMS */ .aligned label { @@ -286,3 +296,7 @@ form .form-row p.datetime { margin-left: inherit; margin-right: 2px; } + +.selector .selector-chooser { + margin: 0; +} diff --git a/static/admin/css/rtl.css.gz b/static/admin/css/rtl.css.gz index 3f4ce964..a067efdc 100644 Binary files a/static/admin/css/rtl.css.gz and b/static/admin/css/rtl.css.gz differ diff --git a/static/admin/css/widgets.0a3765e806b3.css.gz b/static/admin/css/widgets.0a3765e806b3.css.gz deleted file mode 100644 index 385dbc29..00000000 Binary files a/static/admin/css/widgets.0a3765e806b3.css.gz and /dev/null differ diff --git a/static/admin/css/widgets.0a3765e806b3.css b/static/admin/css/widgets.8a70ea6d8850.css similarity index 94% rename from static/admin/css/widgets.0a3765e806b3.css rename to static/admin/css/widgets.8a70ea6d8850.css index d060ab92..c4f23580 100644 --- a/static/admin/css/widgets.0a3765e806b3.css +++ b/static/admin/css/widgets.8a70ea6d8850.css @@ -1,23 +1,23 @@ /* SELECTOR (FILTER INTERFACE) */ .selector { - width: 800px; - float: left; display: flex; + flex-grow: 1; + gap: 0 10px; } .selector select { - width: 380px; height: 17.2em; flex: 1 0 auto; + overflow: scroll; + width: 100%; } .selector-available, .selector-chosen { - width: 380px; text-align: center; - margin-bottom: 5px; display: flex; flex-direction: column; + flex: 1 1; } .selector-available h2, .selector-chosen h2 { @@ -41,7 +41,7 @@ } .selector-chosen h2 { - background: var(--primary); + background: var(--secondary); color: var(--header-link-color); } @@ -58,6 +58,7 @@ font-size: 0.625rem; margin: 0; text-align: left; + display: flex; } .selector .selector-filter label, @@ -69,11 +70,15 @@ padding: 0; overflow: hidden; line-height: 1; + min-width: auto; +} + +.selector-filter input { + flex-grow: 1; } .selector .selector-available input, .selector .selector-chosen input { - width: 320px; margin-left: 8px; } @@ -82,7 +87,7 @@ width: 22px; background-color: var(--selected-bg); border-radius: 10px; - margin: 0 5px; + margin: 0; padding: 0; transform: translateY(-17px); } @@ -146,7 +151,7 @@ a.selector-chooseall, a.selector-clearall { display: inline-block; height: 16px; text-align: left; - margin: 1px auto 3px; + margin: 0 auto; overflow: hidden; font-weight: bold; line-height: 16px; @@ -446,7 +451,7 @@ span.clearable-file-input label { } .calendar td.selected a { - background: var(--primary); + background: var(--secondary); color: var(--button-fg); } @@ -533,17 +538,17 @@ span.clearable-file-input label { margin: 0; padding: 4px 0; font-size: 0.75rem; - background: #eee; + background: var(--close-button-bg); border-top: 1px solid var(--border-color); - color: var(--body-fg); + color: var(--button-fg); } .calendar-cancel:focus, .calendar-cancel:hover { - background: #ddd; + background: var(--close-button-hover-bg); } .calendar-cancel a { - color: black; + color: var(--button-fg); display: block; } @@ -574,26 +579,21 @@ ul.timelist, .timelist li { /* RELATED WIDGET WRAPPER */ .related-widget-wrapper { - float: left; /* display properly in form rows with multiple fields */ - overflow: hidden; /* clear floated contents */ + display: flex; + gap: 0 10px; + flex-grow: 1; + flex-wrap: wrap; + margin-bottom: 5px; } .related-widget-wrapper-link { - opacity: 0.3; + opacity: .6; + filter: grayscale(1); } .related-widget-wrapper-link:link { - opacity: .8; -} - -.related-widget-wrapper-link:link:focus, -.related-widget-wrapper-link:link:hover { opacity: 1; -} - -select + .related-widget-wrapper-link, -.related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 7px; + filter: grayscale(0); } /* GIS MAPS */ diff --git a/static/admin/css/widgets.8a70ea6d8850.css.gz b/static/admin/css/widgets.8a70ea6d8850.css.gz new file mode 100644 index 00000000..61c72855 Binary files /dev/null and b/static/admin/css/widgets.8a70ea6d8850.css.gz differ diff --git a/static/admin/css/widgets.css b/static/admin/css/widgets.css index 5f7adcb2..d3d4732c 100644 --- a/static/admin/css/widgets.css +++ b/static/admin/css/widgets.css @@ -1,23 +1,23 @@ /* SELECTOR (FILTER INTERFACE) */ .selector { - width: 800px; - float: left; display: flex; + flex-grow: 1; + gap: 0 10px; } .selector select { - width: 380px; height: 17.2em; flex: 1 0 auto; + overflow: scroll; + width: 100%; } .selector-available, .selector-chosen { - width: 380px; text-align: center; - margin-bottom: 5px; display: flex; flex-direction: column; + flex: 1 1; } .selector-available h2, .selector-chosen h2 { @@ -41,7 +41,7 @@ } .selector-chosen h2 { - background: var(--primary); + background: var(--secondary); color: var(--header-link-color); } @@ -58,6 +58,7 @@ font-size: 0.625rem; margin: 0; text-align: left; + display: flex; } .selector .selector-filter label, @@ -69,11 +70,15 @@ padding: 0; overflow: hidden; line-height: 1; + min-width: auto; +} + +.selector-filter input { + flex-grow: 1; } .selector .selector-available input, .selector .selector-chosen input { - width: 320px; margin-left: 8px; } @@ -82,7 +87,7 @@ width: 22px; background-color: var(--selected-bg); border-radius: 10px; - margin: 0 5px; + margin: 0; padding: 0; transform: translateY(-17px); } @@ -146,7 +151,7 @@ a.selector-chooseall, a.selector-clearall { display: inline-block; height: 16px; text-align: left; - margin: 1px auto 3px; + margin: 0 auto; overflow: hidden; font-weight: bold; line-height: 16px; @@ -446,7 +451,7 @@ span.clearable-file-input label { } .calendar td.selected a { - background: var(--primary); + background: var(--secondary); color: var(--button-fg); } @@ -533,17 +538,17 @@ span.clearable-file-input label { margin: 0; padding: 4px 0; font-size: 0.75rem; - background: #eee; + background: var(--close-button-bg); border-top: 1px solid var(--border-color); - color: var(--body-fg); + color: var(--button-fg); } .calendar-cancel:focus, .calendar-cancel:hover { - background: #ddd; + background: var(--close-button-hover-bg); } .calendar-cancel a { - color: black; + color: var(--button-fg); display: block; } @@ -574,26 +579,21 @@ ul.timelist, .timelist li { /* RELATED WIDGET WRAPPER */ .related-widget-wrapper { - float: left; /* display properly in form rows with multiple fields */ - overflow: hidden; /* clear floated contents */ + display: flex; + gap: 0 10px; + flex-grow: 1; + flex-wrap: wrap; + margin-bottom: 5px; } .related-widget-wrapper-link { - opacity: 0.3; + opacity: .6; + filter: grayscale(1); } .related-widget-wrapper-link:link { - opacity: .8; -} - -.related-widget-wrapper-link:link:focus, -.related-widget-wrapper-link:link:hover { opacity: 1; -} - -select + .related-widget-wrapper-link, -.related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 7px; + filter: grayscale(0); } /* GIS MAPS */ diff --git a/static/admin/css/widgets.css.gz b/static/admin/css/widgets.css.gz index 6ac29fc4..cb0e67e2 100644 Binary files a/static/admin/css/widgets.css.gz and b/static/admin/css/widgets.css.gz differ diff --git a/static/admin/img/icon-hidelink.8d245a995e18.svg b/static/admin/img/icon-hidelink.8d245a995e18.svg new file mode 100644 index 00000000..2a8b404b --- /dev/null +++ b/static/admin/img/icon-hidelink.8d245a995e18.svg @@ -0,0 +1,3 @@ + diff --git a/static/admin/img/icon-hidelink.8d245a995e18.svg.gz b/static/admin/img/icon-hidelink.8d245a995e18.svg.gz new file mode 100644 index 00000000..a6ed981d Binary files /dev/null and b/static/admin/img/icon-hidelink.8d245a995e18.svg.gz differ diff --git a/static/admin/img/icon-hidelink.svg b/static/admin/img/icon-hidelink.svg new file mode 100644 index 00000000..2a8b404b --- /dev/null +++ b/static/admin/img/icon-hidelink.svg @@ -0,0 +1,3 @@ + diff --git a/static/admin/img/icon-hidelink.svg.gz b/static/admin/img/icon-hidelink.svg.gz new file mode 100644 index 00000000..a6ed981d Binary files /dev/null and b/static/admin/img/icon-hidelink.svg.gz differ diff --git a/static/admin/js/SelectFilter2.bdb8d0cc579e.js b/static/admin/js/SelectFilter2.b8cf7343ff9e.js similarity index 98% rename from static/admin/js/SelectFilter2.bdb8d0cc579e.js rename to static/admin/js/SelectFilter2.b8cf7343ff9e.js index 9a4e0a3a..fc59eba7 100644 --- a/static/admin/js/SelectFilter2.bdb8d0cc579e.js +++ b/static/admin/js/SelectFilter2.b8cf7343ff9e.js @@ -30,6 +30,9 @@ Requires core.js and SelectBox.js. //