From a7cb75d73dc7e28550cbbed86494107284a68baa Mon Sep 17 00:00:00 2001
From: Matt <mtt.lov@gmail.com>
Date: Fri, 20 Aug 2021 08:57:10 -0700
Subject: [PATCH] Fixes #6999: Properly align controls on sm and md breakpoints

---
 netbox/project-static/dist/netbox-dark.css  | Bin 808198 -> 808437 bytes
 netbox/project-static/dist/netbox-light.css | Bin 502717 -> 502854 bytes
 netbox/project-static/dist/netbox-print.css | Bin 1659423 -> 1659868 bytes
 netbox/project-static/styles/netbox.scss    |  21 +++++++++++++++-----
 netbox/templates/inc/table_controls.html    |   6 +++---
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 597a969691dcffc312533f8d6f98c67c94bd58cb..3880b02912a1f05942413adfd86ed1a142718d7a 100644
GIT binary patch
delta 182
zcmZo$W%zZqVM7aJ3sVbo3rh=Y3tJ0&3r7oQ3)dEI@8{DCq}a43Cs?seFL=Q%yuIf+
zcX{e`{S%z*)75-=M5n#vwwrEnf|HFSIX|zYC_kro`bIWRqv_eooXTKTk}z=vy^_SF
roK#&PKP@x8v?z7@!Cmaq)6Jhl4ZyEZZ2F?-+!|n;wy*W&iDU-=W{E;~

delta 151
zcmeym+OTbvVM7aJ3sVbo3rh=Y3tJ0&3r7oQ3)dEI@8{DU?s98QPOxH`Uhsljcze%t
z?()>>4<vb5)RPm7QtVPP%k)4D-Hg=4l++?Hza%j!Csj8&Kd+=HKc{$lfHtS%^oB*O
a+|zGmaB@w4?4btMFM&({_Njh63G4usk2hxk

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index f3a42a28d622f12c90b9a7d5f502b773d8a14b2b..2dd22a6124477f44630dd7dd61a9ab33e108d5ac 100644
GIT binary patch
delta 165
zcmdmcUGCToxrP?T7N!>F7M2#)7Pc+y4-+T%X>v_(Ok@|EE|kP7x?L=Z{h9N0iDm3E
zlLa+o_(~F!a#D4Z^YcoI@^gx(FOXn0QmoZO6;(j+(=yXbi&CcxCb3FSKby!dBTs}%
RG1k<)l-k<uwaeHYSOE{ZI(`5E

delta 132
zcmX?hLvHVNxrP?T7N!>F7M2#)7Pc+y4-=<vh-T-QUZ2P=F<mH$Rdl;p68ke}nUu^j
zz2wBA6gwD0HzPGMCAA2|pZ;elyUg@nFBXyM`MJ#8)7R&+b14{^s@B5PV$-ypZ8^IG
FD*$w_F4X`4

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index e9c2621b2b73b71c02a2e1f8c20bb19664e91154..3d0bbb106ffdf424bde79d26cf37562be84e0141 100644
GIT binary patch
delta 408
zcmbQgB=yen)P@$u7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw
z7O@ubEfQU2(?2lt@@}7ACgFH`x`G@d8>8;@{t^kD=>l)X*r!h@kx-c~Fh`Vc`V1#Y
z(dj$FCHSTXaPbOGum8)#%T|(@l#_~8IY)ASUP)1YPVw}QhC)Wu*abwUZ_s396Nd>a
z=t1-X`DvNyrIQ79Ri}T@U}VRoVEV*7ZuRL6`^DHLp$4OwP?TCdJ+Mr|O%`r0*m^Wo
lRI^8Px^=mP1lUj01)L?lz>Wv8Tp*zZWT|f#a*^ca0|3#Ii=zMl

delta 295
zcmcb!Jazt()P@$u7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw
z7O@ubEfQU2)9e58@NS=8CgFH``g;dS4iUSQ%rd>?#G(}4jMT)G)FKdnI+v5A&g1|=
zw&@qvNwA6oC2^@Tp02O~j|y8SNtx+?Bzfegub(Z!HQ9BNI37zEx=QLzpIgnSjNewU
RvRYS36}(n&2P(7X0|24kXQBWA

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 2e1cd3482..0d4fd9b1e 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -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;
diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html
index 871b15aac..a7a7ebfb5 100644
--- a/netbox/templates/inc/table_controls.html
+++ b/netbox/templates/inc/table_controls.html
@@ -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"