From e4af9ebc6f0cc287b780caaec35459de98d7d371 Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Wed, 17 Mar 2021 22:25:20 -0700
Subject: [PATCH] fix import/export styles

---
 netbox/templates/generic/object_list.html     | 19 ++++++++-----------
 .../utilities/templates/buttons/export.html   |  6 +++---
 .../utilities/templates/buttons/import.html   |  6 +-----
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 35a1e630c..01694abf6 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -8,19 +8,16 @@
 {% block controls %}
 <div class="container mb-2 mx-0">
   <div class="d-flex flex-wrap justify-content-end">
-  {% if permissions.add and 'add' in action_buttons %}
+    {% if permissions.add and 'add' in action_buttons %}
         {% add_button content_type.model_class|validated_viewname:"add" %}
     {% endif %}
-    <div class="d-flex flex-shrink-1">
-        <div class="btn-group m-1">
-        {% if permissions.add and 'import' in action_buttons %}
-            {% import_button content_type.model_class|validated_viewname:"import" %}
-        {% endif %}
-        {% if 'export' in action_buttons %}
-            {% export_button content_type %}
-        {% endif %}
-        </div>
-    </div>
+    {% if permissions.add and 'import' in action_buttons %}
+        {% import_button content_type.model_class|validated_viewname:"import" %}
+    {% endif %}
+    {% if 'export' in action_buttons %}
+        {% export_button content_type %}
+    {% endif %}
+    
     <div class="d-flex flex-shrink-1">
     {% if request.user.is_authenticated and table_config_form %}
 
diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html
index 4256b1a73..f72e39f2a 100644
--- a/netbox/utilities/templates/buttons/export.html
+++ b/netbox/utilities/templates/buttons/export.html
@@ -1,10 +1,10 @@
-<div class="btn-group m-1">
+<div class="dropdown m-1">
     <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="bi bi-download"></i>&nbsp;Export
     </button>
     <ul class="dropdown-menu dropdown-menu-end">
-        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export=table">Current view</a></li>
-        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export">Default format</a></li>
+        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export=table">Current View</a></li>
+        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export">Default Format</a></li>
         {% if export_templates %}
         <li class="divider"></li>
         {% for et in export_templates %}
diff --git a/netbox/utilities/templates/buttons/import.html b/netbox/utilities/templates/buttons/import.html
index 49989caa2..63636f2aa 100644
--- a/netbox/utilities/templates/buttons/import.html
+++ b/netbox/utilities/templates/buttons/import.html
@@ -1,7 +1,3 @@
-<a
-  href="{% url import_url %}"
-  type="button"
-  class="btn btn-sm btn-outline-secondary"
->
+<a href="{% url import_url %}" type="button" class="btn btn-sm btn-outline-secondary m-1">
   <i class="bi bi-upload"></i>&nbsp;Import
 </a>