Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed explanation for multiple attempts #3818

Merged
merged 2 commits into from
Oct 28, 2021
Merged

Changed explanation for multiple attempts #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
601eeef
Changed explanation for multiple attempts
Dantemss Oct 27, 2021
ff51f27
Merge branch 'main' into improve_multiple_attempts_examples
Dantemss Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions tutor/src/components/small-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { styled } from 'vendor';
import { colors } from 'theme';

const SmallText = styled.p`
font-size: ${props => props['font-size'] || 'smaller'};
color: ${colors.neutral.thin};
`

export default SmallText
8 changes: 2 additions & 6 deletions tutor/src/screens/assignment-review/grading-block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { React, PropTypes, styled, observer, css, cn } from 'vendor';
import { colors } from 'theme';
import TutorLink from '../../components/link';
import SmallText from '../../components/small-text';
import { Header } from './details';
import PublishScores from '../../components/buttons/publish-scores';

Expand Down Expand Up @@ -58,11 +59,6 @@ const Centered = styled.div`
}
`;

const SmallText = styled.p`
font-size: 1.4rem;
color: ${colors.neutral.thin};
`;

const DarkBlue = css`
border-color: #36D0E9;
background: #DAF3F8;
Expand Down Expand Up @@ -237,7 +233,7 @@ const BeforeDueWRQ = () => {
<BlockWrapper header="Grading">
<Centered>
<p>This assignment is not open for grading yet.</p>
<SmallText>(You can start grading after the due date)</SmallText>
<SmallText font-size="1.4rem">(You can start grading after the due date)</SmallText>
</Centered>
</BlockWrapper>
);
Expand Down
7 changes: 4 additions & 3 deletions tutor/src/screens/grading-templates/editors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import TimeInput from '../../components/time-input';
import Select from '../../components/select';
import TemplateModal from '../../components/course-modal';
import InfoIcon from '../../components/icons/info';
import SmallText from '../../components/small-text';

const propTypes = {
template: PropTypes.instanceOf(GradingTemplate).isRequired,
Expand Down Expand Up @@ -332,9 +333,9 @@ class TemplateForm extends React.Component {
const iconText = (
<>
<strong>Example:</strong>
<div>MCQ with 4 choices, students get 2 (4-2) attempts.</div>
<div>MCQ with 3 choices, students get 1 (3-2) attempt.</div>
<div>MCQ with 2 choices, students get 1 attempt only.</div>
<div>MCQ with 4 choices, students get 2 attempts.</div>
<div>MCQ with 2 choices, students get 1 attempt only.*</div>
<SmallText>*Exception</SmallText>
</>
);

Expand Down