Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17906 from edx/McKenzieW/learner-4893

Browse Source 
move Create Entitlement button up and shrink username search bar
This commit is contained in:
McKenzie Welter
2018-04-10 17:05:49 -04:00
committed by GitHub
parent 881182d176 300427be3f
commit c6064e1c5b
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/djangoapps/support/static/support/jsx/entitlements/components/Main/Main.jsx
View File

@@ -7,7 +7,7 @@ import EntitlementSupportTableContainer from '../Table/EntitlementSupportTableCo
import EntitlementFormContainer from '../EntitlementForm/container.jsx'; import EntitlementFormContainer from '../EntitlementForm/container.jsx';
const Main = props => ( const Main = props => (
<div> <div className="entitlement-support-wrapper">
<StatusAlert <StatusAlert
alertType="danger" alertType="danger"
dialog={props.errorMessage} dialog={props.errorMessage}
@@ -31,12 +31,14 @@ const MainContent = (props) => {
} }
return ( return (
<div> <div>
<SearchContainer /> <div className="actions">
<Button <SearchContainer />
className={['btn', 'btn-primary']} <Button
label="Create New Entitlement" className={['btn', 'btn-primary']}
onClick={props.openCreationForm} label="Create New Entitlement"
/> onClick={props.openCreationForm}
/>
</div>
<EntitlementSupportTableContainer ecommerceUrl={props.ecommerceUrl} /> <EntitlementSupportTableContainer ecommerceUrl={props.ecommerceUrl} />
</div> </div>
); );

2
lms/djangoapps/support/static/support/jsx/entitlements/components/Search/Search.jsx
View File

@@ -24,7 +24,7 @@ class Search extends React.Component {
render() { render() {
return ( return (
<form onSubmit={this.handleSubmit}> <form onSubmit={this.handleSubmit} className="col-md-3 search-form">
<InputText <InputText
name="username" name="username"
label="Search by Username" label="Search by Username"

1
lms/static/sass/bootstrap/lms-main.scss
View File

@@ -27,6 +27,7 @@ $static-path: '../..';
// Individual Pages // Individual Pages
@import "views/program-marketing-page"; @import "views/program-marketing-page";
@import "views/entitlement-support-page";
// Responsive Design // Responsive Design
@import '../header'; @import '../header';

13
lms/static/sass/views/_entitlement-support-page.scss Normal file
View File

@@ -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;
}
}