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

Jump to bottom

Closes #15339: Consume entire viewport #15480

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Closes #15339: Consume entire viewport #15480

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
606d1dd
Closes #15339: Consume entire viewport, except for object detail views
jeremystretch Mar 19, 2024
3af2919
Use fluid containers for all views
jeremystretch Mar 20, 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
6 changes: 3 additions & 3 deletions netbox/templates/base/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1 class="navbar-brand navbar-brand-autodark">

{# Top menu #}
<header class="navbar navbar-expand-md d-none d-lg-flex d-print-none">
<div class="container-xl">
<div class="container-fluid">

{# Nav menu toggle #}
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu" aria-controls="navbar-menu" aria-expanded="false" aria-label="Toggle navigation">
Expand Down Expand Up @@ -105,7 +105,7 @@ <h1 class="navbar-brand navbar-brand-autodark">
{# Page body #}
{% block page %}
<div class="page-body my-1">
<div class="container-xl tab-content py-3">
<div class="container-fluid tab-content py-3">

{# Page content #}
{% block content %}{% endblock %}
Expand All @@ -124,7 +124,7 @@ <h1 class="navbar-brand navbar-brand-autodark">

{# Page footer #}
<footer class="footer footer-transparent d-print-none py-2">
<div class="container-xl d-flex justify-content-between align-items-center">
<div class="container-fluid d-flex justify-content-between align-items-center">
{% block footer %}

{# Footer links #}
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/core/rq_task_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% load render_table from django_tables2 %}

{% block page-header %}
<div class="container-xl">
<div class="container-fluid">
<div class="d-flex justify-content-between align-items-center mt-2">
{# Breadcrumbs #}
<nav class="breadcrumb-container" aria-label="breadcrumb">
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/core/rq_worker_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load render_table from django_tables2 %}

{% block page-header %}
<div class="container-xl">
<div class="container-fluid">
<div class="d-flex justify-content-between align-items-center mt-2">
{# Breadcrumbs #}
<nav class="breadcrumb-container" aria-label="breadcrumb">
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/extras/script_result.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% endblock %}

{% block page-header %}
<div class="container-xl mt-2">
<div class="container-fluid mt-2">
<nav class="breadcrumb-container" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">{% trans "Scripts" %}</a></li>
Expand Down
4 changes: 2 additions & 2 deletions netbox/templates/generic/_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ block.super }}

{% block page-header %}
<div class="container-xl mt-2 d-print-none">
<div class="container-fluid mt-2 d-print-none">
<div class="d-flex justify-content-between">

{# Title #}
Expand All @@ -29,7 +29,7 @@ <h2 class="page-title my-1">{% block title %}{% endblock title %}</h2>

{# Tabs #}
<div class="page-tabs mt-3">
<div class="container-xl">
<div class="container-fluid">
{% block tabs %}{% endblock %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/generic/bulk_delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h4 class="alert-title">{% trans "Confirm Bulk Deletion" %}</h4>
{# Selected objects list #}
<div class="tab-pane" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
<div class="card">
<div class="card-body table-responsive">
<div class="table-responsive">
{% render_table table 'inc/table.html' %}
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions netbox/templates/generic/bulk_remove.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ <h4 class="alert-title">{% trans "Confirm Bulk Removal" %}</h4>
</div>
</div>
</div>
<div class="container-xl px-0">
<div class="table-responsive">
{% render_table table 'inc/table.html' %}
<div class="container-fluid px-0">
<div class="card">
<div class="table-responsive">
{% render_table table 'inc/table.html' %}
</div>
</div>
<form action="." method="post" class="form">
{% csrf_token %}
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/generic/object.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% endcomment %}

{% block page-header %}
<div class="container-xl">
<div class="container-fluid">
<div class="d-flex justify-content-between align-items-center mt-2">

{# Breadcrumbs #}
Expand Down
Loading