Commit b8337fb2 authored by David Haynes's avatar David Haynes 🙆
Browse files

ScheduleBadge looks ok enough

- enough wiggle room for future design work
- also it needs to be abstracted from ScheduleBadge into another
component
- 🤷
parent 29526a51
Pipeline #2737 passed with stage
in 1 minute and 58 seconds
...@@ -17,7 +17,7 @@ const CourseSectionCard = ({ ...@@ -17,7 +17,7 @@ const CourseSectionCard = ({
courseSectionActionButtonText, courseSectionActionButtonText,
destructive, destructive,
}: CourseSectionCardProps) => ( }: CourseSectionCardProps) => (
<Row className="justify-content-center"> <Row className="justify-content-center my-3">
<Col md="9"> <Col md="9">
<Card> <Card>
<CardBody> <CardBody>
......
...@@ -39,14 +39,25 @@ class ScheduleBadge extends React.Component<ScheduleBadgeProps, State> { ...@@ -39,14 +39,25 @@ class ScheduleBadge extends React.Component<ScheduleBadgeProps, State> {
id="cart" id="cart"
/> />
</Row> </Row>
<Collapse isOpen={this.state.collapse}> <Collapse isOpen={this.state.collapse}>
<Card> <Card>
<CardTitle className="mt-3"> <CardBody>
<Row className="justify-content-center"> <Row className="my-3">
<Button size="sm" outline color="danger" onClick={this.toggle}> <h1 className="px-5">Your Schedule</h1>
<Button className="ml-auto px-5" outline color="danger" onClick={this.toggle}>
Close Close
</Button> </Button>
<h1 className="px-3">Your Schedule</h1> </Row>
<CourseSectionList
courseSections={schedule}
courseSectionAction={removeCourseSection}
courseSectionActionButtonText="Remove from schedule"
destructive
/>
<Row className="justify-content-center">
<Button <Button
size="sm" size="sm"
outline outline
...@@ -56,15 +67,6 @@ class ScheduleBadge extends React.Component<ScheduleBadgeProps, State> { ...@@ -56,15 +67,6 @@ class ScheduleBadge extends React.Component<ScheduleBadgeProps, State> {
Generate Generate
</Button> </Button>
</Row> </Row>
</CardTitle>
<legend />
<CardBody>
<CourseSectionList
courseSections={schedule}
courseSectionAction={removeCourseSection}
courseSectionActionButtonText="Remove from schedule"
destructive
/>
</CardBody> </CardBody>
</Card> </Card>
</Collapse> </Collapse>
......
...@@ -26,8 +26,7 @@ module.exports = { ...@@ -26,8 +26,7 @@ module.exports = {
}, },
module: { module: {
rules: [ rules: [{
{
test: /\.tsx?$/, test: /\.tsx?$/,
loader: 'awesome-typescript-loader', loader: 'awesome-typescript-loader',
exclude: /node_modules/, exclude: /node_modules/,
...@@ -39,8 +38,7 @@ module.exports = { ...@@ -39,8 +38,7 @@ module.exports = {
}, },
{ {
test: /\.css$/, test: /\.css$/,
use: [ use: [{
{
loader: 'style-loader', loader: 'style-loader',
}, },
{ {
...@@ -48,26 +46,6 @@ module.exports = { ...@@ -48,26 +46,6 @@ module.exports = {
}, },
], ],
}, },
{
test: /\.woff(\?.+)?$/,
use: 'url-loader?limit=10000&mimetype=application/font-woff',
},
{
test: /\.woff2(\?.+)?$/,
use: 'url-loader?limit=10000&mimetype=application/font-woff',
},
{
test: /\.ttf(\?.+)?$/,
use: 'file-loader',
},
{
test: /\.eot(\?.+)?$/,
use: 'file-loader',
},
{
test: /\.svg(\?.+)?$/,
use: 'file-loader',
},
{ {
test: /\.(js)$/, test: /\.(js)$/,
exclude: /(node_modules)/, exclude: /(node_modules)/,
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment