From 78dedbb5bbe7d18e8fb91f5441af5bc26a6bf401 Mon Sep 17 00:00:00 2001
From: Nikolay Yurchenko <nickolai.yurchenko@gmail.com>
Date: Wed, 24 Apr 2019 00:06:33 +1000
Subject: [PATCH] search input and button swapped (#1643)

---
 .../src/components/apiKeys/headerArea/HeaderArea.vue          | 4 ++--
 .../src/components/apiKeys/headerArea/SearchArea.vue          | 2 +-
 web/satellite/src/components/team/headerArea/HeaderArea.vue   | 4 ++--
 web/satellite/src/components/team/headerArea/SearchArea.vue   | 2 +-
 .../src/components/team/headerArea/SortUsersDropdown.vue      | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/satellite/src/components/apiKeys/headerArea/HeaderArea.vue b/web/satellite/src/components/apiKeys/headerArea/HeaderArea.vue
index 05f4ed182..20b094375 100644
--- a/web/satellite/src/components/apiKeys/headerArea/HeaderArea.vue
+++ b/web/satellite/src/components/apiKeys/headerArea/HeaderArea.vue
@@ -4,10 +4,10 @@
 <template>
     <div class="api-keys-header-container">
         <div class="api-keys-header-container__item">
-            <SearchArea />
             <div id="addApiKeyPopupButton">
                 <Button label="New API Key" width="240px" height="54px" :onPress="togglePopup" />
             </div>
+            <SearchArea />
         </div>
         <div class="api-keys-header-container__item">
             <!-- <SortApiKeysHeader /> -->
@@ -54,4 +54,4 @@ export default class HeaderArea extends Vue {
             }
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/satellite/src/components/apiKeys/headerArea/SearchArea.vue b/web/satellite/src/components/apiKeys/headerArea/SearchArea.vue
index 2441467c6..4a19f3fc9 100644
--- a/web/satellite/src/components/apiKeys/headerArea/SearchArea.vue
+++ b/web/satellite/src/components/apiKeys/headerArea/SearchArea.vue
@@ -40,7 +40,7 @@ export default class SearchArea extends Vue {
     .search-container {
         width: 100%;
         height: 56px;
-        margin-right: 24px;
+        margin-left: 24px;
 
         &__wrap {
             position: relative;
diff --git a/web/satellite/src/components/team/headerArea/HeaderArea.vue b/web/satellite/src/components/team/headerArea/HeaderArea.vue
index ba2df2570..b28f7dd4e 100644
--- a/web/satellite/src/components/team/headerArea/HeaderArea.vue
+++ b/web/satellite/src/components/team/headerArea/HeaderArea.vue
@@ -3,9 +3,9 @@
 
 <template>
     <div class="team-header-container">
+        <Button label="Add User" width="240px" height="58px" :onPress="onAddUsersClick" id="addTeamMemberPopupButton" />
         <SortUsersDropdown />
         <SearchArea />
-        <Button label="Add User" width="240px" height="58px" :onPress="onAddUsersClick" id="addTeamMemberPopupButton" />
     </div>
 </template>
 
@@ -40,4 +40,4 @@ export default class HeaderArea extends Vue {
         align-items: center;
         justify-content: flex-start;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/satellite/src/components/team/headerArea/SearchArea.vue b/web/satellite/src/components/team/headerArea/SearchArea.vue
index df1509cac..3e43e9138 100644
--- a/web/satellite/src/components/team/headerArea/SearchArea.vue
+++ b/web/satellite/src/components/team/headerArea/SearchArea.vue
@@ -50,7 +50,7 @@
     .search-container {
         width: 100%;
         height: 56px;
-        margin: 0 24px;
+        margin: 0 0 0 24px;
 
         &__wrap {
             position: relative;
diff --git a/web/satellite/src/components/team/headerArea/SortUsersDropdown.vue b/web/satellite/src/components/team/headerArea/SortUsersDropdown.vue
index b44ed35c4..42aa0e4b9 100644
--- a/web/satellite/src/components/team/headerArea/SortUsersDropdown.vue
+++ b/web/satellite/src/components/team/headerArea/SortUsersDropdown.vue
@@ -74,6 +74,7 @@ export default class SortUsersDropdown extends Vue {
         box-sizing: border-box;
         border-radius: 6px;
         transition: all .2s ease-in-out;
+        margin-left: 24px;
 
         &:hover {
             box-shadow: 0px 4px rgba(231, 232, 238, 0.6);
@@ -118,4 +119,4 @@ export default class SortUsersDropdown extends Vue {
             }
         }
     }
-</style>
\ No newline at end of file
+</style>