Compare commits
3 Commits
open-relea
...
open-relea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a20b122b4e | ||
|
|
a7b052fc42 | ||
|
|
09dbdb10ee |
@@ -10,6 +10,7 @@ $fa-font-path: "~font-awesome/fonts";
|
||||
$input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.0.0 to work
|
||||
|
||||
@import "~@edx/frontend-component-footer/dist/_footer";
|
||||
@import "~@edx/frontend-component-header/dist/index";
|
||||
|
||||
#root {
|
||||
display: flex;
|
||||
|
||||
@@ -16,7 +16,7 @@ import ReviewError from './ReviewError';
|
||||
*/
|
||||
export class LockErrors extends React.Component {
|
||||
get errorProp() {
|
||||
if (this.props.errorStatus === ErrorStatuses.forbidden) {
|
||||
if (this.props.errorStatus === ErrorStatuses.conflict) {
|
||||
return {
|
||||
heading: messages.errorLockContestedHeading,
|
||||
message: messages.errorLockContested,
|
||||
|
||||
@@ -41,7 +41,7 @@ describe('LockErrors component', () => {
|
||||
expect(el.snapshot).toMatchSnapshot();
|
||||
});
|
||||
test('snapshot: error with conflicted lock', () => {
|
||||
el = shallow(<LockErrors {...props} errorStatus={ErrorStatuses.forbidden} />);
|
||||
el = shallow(<LockErrors {...props} errorStatus={ErrorStatuses.conflict} />);
|
||||
expect(el.snapshot).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -4,12 +4,8 @@
|
||||
background-color: $gray-300 !important;
|
||||
padding: inherit;
|
||||
|
||||
& > div.pgn__modal-body-content {
|
||||
& > div.pgn__modal-body-content .row {
|
||||
height: 100%;
|
||||
|
||||
.row {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.content-block {
|
||||
@@ -40,4 +36,4 @@
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user