From 300427be3fcd190deceb292ceeb3be85f3f1a923 Mon Sep 17 00:00:00 2001
From: McKenzie Welter <mwelter@edx.org>
Date: Mon, 9 Apr 2018 09:31:38 -0400
Subject: [PATCH] move Create Entitlement button up and shrink username search
 bar

---
 .../jsx/entitlements/components/Main/Main.jsx  | 18 ++++++++++--------
 .../entitlements/components/Search/Search.jsx  |  2 +-
 lms/static/sass/bootstrap/lms-main.scss        |  3 ++-
 .../sass/views/_entitlement-support-page.scss  | 13 +++++++++++++
 4 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 lms/static/sass/views/_entitlement-support-page.scss

diff --git a/lms/djangoapps/support/static/support/jsx/entitlements/components/Main/Main.jsx b/lms/djangoapps/support/static/support/jsx/entitlements/components/Main/Main.jsx
index 7a30cbd6f0..52ed6eca8b 100644
--- a/lms/djangoapps/support/static/support/jsx/entitlements/components/Main/Main.jsx
+++ b/lms/djangoapps/support/static/support/jsx/entitlements/components/Main/Main.jsx
@@ -7,7 +7,7 @@ import EntitlementSupportTableContainer from '../Table/EntitlementSupportTableCo
 import EntitlementFormContainer from '../EntitlementForm/container.jsx';
 
 const Main = props => (
-  <div>
+  <div className="entitlement-support-wrapper">
     <StatusAlert
       alertType="danger"
       dialog={props.errorMessage}
@@ -28,15 +28,17 @@ const Main = props => (
 const MainContent = (props) => {
   if (props.isFormOpen) {
     return <EntitlementFormContainer />;
-  } 
+  }
   return (
     <div>
-      <SearchContainer />
-      <Button
-        className={['btn', 'btn-primary']}
-        label="Create New Entitlement"
-        onClick={props.openCreationForm}
-      />
+      <div className="actions">
+        <SearchContainer />
+        <Button
+          className={['btn', 'btn-primary']}
+          label="Create New Entitlement"
+          onClick={props.openCreationForm}
+        />
+      </div>
       <EntitlementSupportTableContainer ecommerceUrl={props.ecommerceUrl} />
     </div>
   );
diff --git a/lms/djangoapps/support/static/support/jsx/entitlements/components/Search/Search.jsx b/lms/djangoapps/support/static/support/jsx/entitlements/components/Search/Search.jsx
index 9cd62bc100..053db5b8d3 100644
--- a/lms/djangoapps/support/static/support/jsx/entitlements/components/Search/Search.jsx
+++ b/lms/djangoapps/support/static/support/jsx/entitlements/components/Search/Search.jsx
@@ -24,7 +24,7 @@ class Search extends React.Component {
 
   render() {
     return (
-      <form onSubmit={this.handleSubmit}>
+      <form onSubmit={this.handleSubmit} className="col-md-3 search-form">
         <InputText
           name="username"
           label="Search by Username"
diff --git a/lms/static/sass/bootstrap/lms-main.scss b/lms/static/sass/bootstrap/lms-main.scss
index 99b9b7b314..24af209f65 100644
--- a/lms/static/sass/bootstrap/lms-main.scss
+++ b/lms/static/sass/bootstrap/lms-main.scss
@@ -27,6 +27,7 @@ $static-path: '../..';
 
 // Individual Pages
 @import "views/program-marketing-page";
+@import "views/entitlement-support-page";
 
 // Responsive Design
 @import '../header';
@@ -35,4 +36,4 @@ $static-path: '../..';
 @import 'lms/theme/extras';
 
 // Experiments
-@import 'experiments';
\ No newline at end of file
+@import 'experiments';
diff --git a/lms/static/sass/views/_entitlement-support-page.scss b/lms/static/sass/views/_entitlement-support-page.scss
new file mode 100644
index 0000000000..675dc56ce1
--- /dev/null
+++ b/lms/static/sass/views/_entitlement-support-page.scss
@@ -0,0 +1,13 @@
+.entitlement-support-wrapper {
+  div.actions {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+
+  form.search-form {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}