Constrain tabs to container-xl; tweak header margins

This commit is contained in:
Jeremy Stretch 2024-01-11 16:36:39 -05:00
parent a9d30d35ac
commit 68ccee7cb1
21 changed files with 28 additions and 22 deletions

Binary file not shown.

View File

@ -1,7 +1,11 @@
// In-page content tabs
.page-tabs {
// Set the border on page-tabs to ensure it expands the full page width
border-bottom: 1px solid $card-border-color;
.nav-tabs {
position: relative;
border: none;
.nav-link {
&.active,

View File

@ -2,7 +2,7 @@
{% load i18n %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li role="presentation" class="nav-item">
<a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'account:profile' %}">{% trans "Profile" %}</a>
</li>

View File

@ -24,7 +24,7 @@
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3" role="tablist">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">{% trans "Restore" %}</a>
</li>

View File

@ -25,7 +25,7 @@
{% block controls %}{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<a class="nav-link{% if not tab %} active{% endif %}" href="{% url 'extras:report' module=report.module name=report.class_name %}">{% trans "Report" %}</a>
</li>

View File

@ -7,7 +7,7 @@
{% block title %}{% trans "Reports" %}{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<a class="nav-link active" role="tab">{% trans "Reports" %}</a>
</li>

View File

@ -24,7 +24,7 @@
{% block controls %}{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<a class="nav-link{% if not tab %} active{% endif %}" href="{% url 'extras:script' module=script.module name=script.class_name %}">{% trans "Script" %}</a>
</li>

View File

@ -15,7 +15,7 @@
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<a class="nav-link active" role="tab">{% trans "Scripts" %}</a>
</li>

View File

@ -37,7 +37,7 @@
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3" role="tablist">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">{% trans "Log" %}</a>
</li>

View File

@ -10,7 +10,7 @@
{# Title #}
<div class="col">
<h2 class="page-title mb-1">{% block title %}{% endblock title %}</h2>
<h2 class="page-title my-1">{% block title %}{% endblock title %}</h2>
{% block subtitle %}{% endblock %}
</div>
@ -25,8 +25,10 @@
{# Tabs #}
<div class="page-tabs mt-3">
<div class="container-xl">
{% block tabs %}{% endblock %}
</div>
</div>
</div>
{% endblock header %}

View File

@ -9,7 +9,7 @@
{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="component-form-tab" data-bs-toggle="tab" data-bs-target="#component-form" type="button" role="tab" aria-controls="component-form" aria-selected="true">
{% trans "Bulk Creation" %}

View File

@ -19,7 +19,7 @@ Context:
{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="delete-form-tab" data-bs-toggle="tab" data-bs-target="#delete-form" type="button" role="tab" aria-controls="delete-form" aria-selected="true">
{% trans "Bulk Delete" %}

View File

@ -17,7 +17,7 @@ Context:
{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="edit-form-tab" data-bs-toggle="tab" data-bs-target="#edit-form" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
{% trans "Bulk Edit" %}

View File

@ -14,7 +14,7 @@ Context:
{% block title %}{{ model|meta:"verbose_name"|bettertitle }} {% trans "Bulk Import" %}{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="import-form-tab" data-bs-toggle="tab" data-bs-target="#import-form" data-href="#tab_import-form" type="button" role="tab" aria-controls="import-form" aria-selected="true">
{% trans "Direct Import" %}

View File

@ -8,7 +8,7 @@
{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
{% trans "Bulk Remove" %}

View File

@ -8,7 +8,7 @@
{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
{% trans "Bulk Rename" %}

View File

@ -20,7 +20,7 @@ Context:
{% block page-header %}
<div class="container-xl">
<div class="d-flex justify-content-between align-items-center my-2">
<div class="d-flex justify-content-between align-items-center mt-2">
{# Breadcrumbs #}
<ol class="breadcrumb" aria-label="breadcrumbs">
@ -82,7 +82,7 @@ Context:
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
{# Primary tab #}
<li class="nav-item" role="presentation">
<a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>

View File

@ -36,7 +36,7 @@ Context:
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="edit-form-tab" data-bs-toggle="tab" data-bs-target="#edit-form" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
{% if object.pk %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}

View File

@ -40,7 +40,7 @@ Context:
{% endblock controls %}
{% block tabs %}
<ul class="nav nav-tabs px-3" role="tablist">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a class="nav-link active" id="object-list-tab" data-bs-toggle="tab" data-bs-target="#object-list" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
{% trans "Results" %} {% badge table.page.paginator.count %}

View File

@ -1,7 +1,7 @@
{% load helpers %}
{% load i18n %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item">
<a
class="nav-link {% if active_tab == 'add' %}active{% endif %}"

View File

@ -1,4 +1,4 @@
{% extends 'base/layout.html' %}
{% extends 'generic/_base.html' %}
{% load helpers %}
{% load form_helpers %}
{% load render_table from django_tables2 %}
@ -7,7 +7,7 @@
{% block title %}{% trans "Search" %}{% endblock %}
{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" type="button" role="tab">
{% trans "Results" %}