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

Fixes #6999: Properly align controls on sm and md breakpoints

Browse Source
This commit is contained in:
Matt
2021-08-20 08:57:10 -07:00
parent 23b7bbf2ee
commit acca0a511d
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/project-static/dist/netbox-dark.css vendored
View File

File diff suppressed because one or more lines are too long

2
netbox/project-static/dist/netbox-light.css vendored
View File

File diff suppressed because one or more lines are too long

2
netbox/project-static/dist/netbox-print.css vendored
View File

File diff suppressed because one or more lines are too long

21
netbox/project-static/styles/netbox.scss
View File

@@ -288,7 +288,7 @@ div.title-container {
justify-content: flex-start;
// Right-align controls on larger screens.
@include media-breakpoint-up(md) {
@include media-breakpoint-up(lg) {
justify-content: flex-end;
}
@@ -872,11 +872,22 @@ div.card-overlay {
}
}
div.card > div.card-header > div.table-controls {
.table-controls {
display: flex;
align-items: center;
width: 100%;
max-width: 25%;
@include media-breakpoint-up(md) {
// `!important` needed because of inherited margin-bottom from `.col`
margin-top: 0 !important;
margin-bottom: 0 !important;
}
.table-configure {
justify-content: flex-start;
@include media-breakpoint-up(md) {
justify-content: flex-end;
}
}
.form-switch.form-check-inline {
flex: 1 0 auto;

6
netbox/templates/inc/table_controls.html
View File

@@ -1,5 +1,5 @@
<div class="row mb-3 justify-content-between">
<div class="col col-12 col-lg-4 my-3 my-lg-0 d-flex noprint table-controls">
<div class="table-controls noprint col col-12 col-md-8 col-lg-4">
<div class="input-group input-group-sm">
<input
type="text"
@@ -9,9 +9,9 @@
/>
</div>
</div>
<div class="col col-md-3 mb-0 d-flex noprint table-controls">
<div class="table-controls noprint col col-md-3 mb-0">
{% if request.user.is_authenticated and table_modal %}
<div class="input-group input-group-sm justify-content-end">
<div class="table-configure input-group input-group-sm">
<button
type="button"
data-bs-toggle="modal"