Switch magic flexy rigboard layout to use *container* width queries rather than *screen* width queries

This resolves the overflow seen in the profile detail view in the most overkill way possible. Nerf this!
This commit is contained in:
2024-04-06 19:14:23 +01:00
parent 17fa447861
commit 953b691cc2
4 changed files with 37 additions and 18 deletions

View File

@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12" style="container-type: inline-size;">
{% with object_list as events %} {% with object_list as events %}
{% include 'partials/event_table.html' %} {% include 'partials/event_table.html' %}
{% endwith %} {% endwith %}

View File

@@ -11,6 +11,14 @@
grid-column: 1/5; grid-column: 1/5;
grid-template-columns: subgrid; grid-template-columns: subgrid;
padding: 1em; padding: 1em;
dt {
float: left;
clear: left;
margin-right: 10px;
}
dd {
margin-left: 0px;
}
} }
.grid-header { .grid-header {
border-bottom: 1px solid grey; border-bottom: 1px solid grey;
@@ -23,7 +31,13 @@
grid-row-start: 1; grid-row-start: 1;
grid-column-start: 4; grid-column-start: 4;
} }
@media (max-width: 600px) { .c-none {
display: none;
}
.c-inline {
display: inline;
}
@container (width <= 500px) {
#event_table { #event_table {
grid-template-columns: 1fr !important; grid-template-columns: 1fr !important;
} }
@@ -43,9 +57,9 @@
#event_mic { #event_mic {
grid-row-start: auto; grid-row-start: auto;
grid-column-start: 4; grid-column-start: 4;
}
} }
} @container (width <= 700px) {
@media (max-width: 900px) {
#event_table { #event_table {
grid-template-columns: max-content; grid-template-columns: max-content;
column-gap: 0.5em; column-gap: 0.5em;
@@ -68,17 +82,20 @@
#event_status { #event_status {
grid-column: span 2; grid-column: span 2;
} }
.grid-header { .grid-header, .c-md-none {
display: none; display: none;
} }
} }
dt { @container (width > 700px) {
float: left; .c-lg-block {
clear: left; display: block;
margin-right: 10px; }
} .c-lg-inline {
dd { display: inline;
margin-left: 0px; }
.c-lg-none, .c-md-none {
display: none;
}
} }
</style> </style>
<div id="event_table"> <div id="event_table">
@@ -105,7 +122,7 @@ dd {
table-warning table-warning
{% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row"> {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
<!---Number--> <!---Number-->
<div class="font-weight-bold d-none d-lg-block" id="event_number">{{ event.display_id }}</div> <div class="font-weight-bold c-none c-lg-block" id="event_number">{{ event.display_id }}</div>
<!--Dates & Times--> <!--Dates & Times-->
<div id="event_dates" style="min-width: 180px;"> <div id="event_dates" style="min-width: 180px;">
<dl> <dl>
@@ -139,12 +156,12 @@ dd {
<div id="event_details" class="w-100"> <div id="event_details" class="w-100">
<h4> <h4>
<a href="{% url 'event_detail' event.pk %}"> <a href="{% url 'event_detail' event.pk %}">
<span class="d-inline d-lg-none">{{ event }}</span><span class="d-none d-lg-inline">{{ event.name }}</span> <span class="c-inline c-lg-none">{{ event }}</span><span class="c-none c-lg-inline">{{ event.name }}</span>
</a> </a>
{% if event.dry_hire %} {% if event.dry_hire %}
<span class="badge badge-secondary">Dry Hire</span> <span class="badge badge-secondary">Dry Hire</span>
{% endif %} {% endif %}
<br class="d-none d-lg-inline"> <br class="c-none c-lg-inline">
{% if event.venue %} {% if event.venue %}
<small>at {{ event.venue|namewithnotes:'venue_detail' }}</small> <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
{% endif %} {% endif %}
@@ -164,7 +181,7 @@ dd {
{% include 'partials/event_status.html' %} {% include 'partials/event_status.html' %}
<!---MIC--> <!---MIC-->
<div id="event_mic" class="text-nowrap"> <div id="event_mic" class="text-nowrap">
<span class="d-md-none align-middle">MIC:</span> <span class="c-md-none align-middle">MIC:</span>
{% if event.mic %} {% if event.mic %}
{% if perms.RIGS.view_profile %} {% if perms.RIGS.view_profile %}
<a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href"> <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">

View File

@@ -12,7 +12,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div style="container-type: inline-size;">
{% include 'partials/event_table.html' %} {% include 'partials/event_table.html' %}
</div>
{% endblock %} {% endblock %}

View File

@@ -167,9 +167,11 @@
<div class="col-lg-6"> <div class="col-lg-6">
<div class="card"> <div class="card">
<div class="card-header">Events</div> <div class="card-header">Events</div>
<div style="container-type: size; height: 30vh; overflow-y: scroll;">
{% with object.latest_events as events %} {% with object.latest_events as events %}
{% include 'partials/event_table.html' %} {% include 'partials/event_table.html' %}
{% endwith %} {% endwith %}
</div>
</div> </div>
</div> </div>
</div> </div>