NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 20:12:00 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

#16009 Removed floating div background and moved filter form buttons outside of card

Browse Source
This commit is contained in:
atownson 2024-09-20 11:02:59 -05:00
parent 7de5efda2a
commit 30e67047d3
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
netbox/project-static/dist/netbox.css vendored
View File

Binary file not shown.

8
netbox/project-static/styles/custom/_misc.scss
View File

@ -39,5 +39,11 @@ span.color-label {
position: sticky;
bottom: 0px;
z-index: 1;
padding: 2px 0px 10px 0px;
float: right;
padding: 0 0 10px;
}
// Override a transparent background
.btn-float {
--tblr-btn-bg: var(--#{$prefix}bg-surface-tertiary) !important;
}

4
netbox/project-static/styles/overrides/_tabler.scss
View File

@ -52,7 +52,7 @@ pre {
}
// Altering background colors
.page, .page-tabs .nav-tabs .nav-link.active, .btn-float-group {
.page, .page-tabs .nav-tabs .nav-link.active {
background-color: var(--#{$prefix}bg-surface-tertiary) !important;
}
.page-body .card .card-header {
@ -105,7 +105,7 @@ body[data-bs-theme=dark] {
.navbar, .page-header {
background-color: $rich-black;
}
.page, .page-tabs .nav-tabs .nav-link.active, .btn-float-group {
.page, .page-tabs .nav-tabs .nav-link.active {
background-color: $rich-black-light !important;
}

4
netbox/templates/generic/bulk_edit.html
View File

@ -102,8 +102,8 @@ Context:
{% endif %}
<div class="text-end btn-float-group">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<div class="btn-float-group">
<a href="{{ return_url }}" class="btn btn-outline-secondary btn-float">{% trans "Cancel" %}</a>
<button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
</div>

6
netbox/templates/generic/object_edit.html
View File

@ -67,9 +67,9 @@ Context:
{% endblock form %}
</div>
<div class="text-end my-3 btn-float-group">
<div class="btn-float-group">
{% block buttons %}
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary btn-float">{% trans "Cancel" %}</a>
{% if object.pk %}
<button type="submit" name="_update" class="btn btn-primary">
{% trans "Save" %}
@ -79,7 +79,7 @@ Context:
<button type="submit" name="_create" class="btn btn-primary">
{% trans "Create" %}
</button>
<button type="submit" name="_addanother" class="btn btn-outline-primary">
<button type="submit" name="_addanother" class="btn btn-outline-primary btn-float">
{% trans "Create & Add Another" %}
</button>
</div>

16
netbox/templates/inc/filter_list.html
View File

@ -37,13 +37,13 @@
</div>
{% endif %}
</div>
<div class="card-footer text-end btn-float-group d-print-none border-0">
<button type="button" class="btn btn-outline-danger m-1" data-reset-select>
<i class="mdi mdi-backspace"></i> {% trans "Reset" %}
</button>
<button type="submit" class="btn btn-primary m-1">
<i class="mdi mdi-magnify"></i> {% trans "Search" %}
</button>
</div>
</div>
<div class="btn-float-group me-1">
<button type="button" class="btn btn-outline-danger btn-float" data-reset-select>
<i class="mdi mdi-backspace"></i> {% trans "Reset" %}
</button>
<button type="submit" class="btn btn-primary">
<i class="mdi mdi-magnify"></i> {% trans "Search" %}
</button>
</div>
</form>