Skip to content

Commit 5b2e224

Browse files
author
Martin Krulis
committed
Renaming bsSize to size.
1 parent ea26a00 commit 5b2e224

File tree

76 files changed

+175
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+175
-202
lines changed

‎0001-Easter-eggs.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ index 263acffc..d5e0b6c7 100644
187187
isOpen={submitting}
188188
/>
189189
+ <Modal
190-
+ bsSize="large"
190+
+ size="large"
191191
+ show={this.state.luckyOpen}
192192
+ onHide={() => this.setState({ luckyOpen: false })}
193193
+ >

‎src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ const AssignmentTableRow = ({
113113
<FormattedMessage id="generic.discussion" defaultMessage="Discussion" />
114114
</Tooltip>
115115
}>
116-
<Button bsSize="xs" variant="info" onClick={discussionOpen}>
116+
<Button size="xs" variant="info" onClick={discussionOpen}>
117117
<ChatIcon smallGapLeft smallGapRight />
118118
</Button>
119119
</OverlayTrigger>
120120
) : (
121-
<Button bsSize="xs" variant="info" onClick={discussionOpen}>
121+
<Button size="xs" variant="info" onClick={discussionOpen}>
122122
<ChatIcon gapRight />
123123
<FormattedMessage id="generic.discussion" defaultMessage="Discussion" />
124124
</Button>
@@ -134,7 +134,7 @@ const AssignmentTableRow = ({
134134
<FormattedMessage id="generic.results" defaultMessage="Results" />
135135
</Tooltip>
136136
}>
137-
<Button bsSize="xs" variant="primary">
137+
<Button size="xs" variant="primary">
138138
<ResultsIcon smallGapLeft smallGapRight />
139139
</Button>
140140
</OverlayTrigger>
@@ -148,13 +148,13 @@ const AssignmentTableRow = ({
148148
<FormattedMessage id="generic.edit" defaultMessage="Edit" />
149149
</Tooltip>
150150
}>
151-
<Button bsSize="xs" variant="warning">
151+
<Button size="xs" variant="warning">
152152
<EditIcon smallGapLeft smallGapRight />
153153
</Button>
154154
</OverlayTrigger>
155155
</LinkContainer>
156156

157-
<DeleteAssignmentButtonContainer id={id} bsSize="xs" captionAsTooltip />
157+
<DeleteAssignmentButtonContainer id={id} size="xs" captionAsTooltip />
158158
</React.Fragment>
159159
)}
160160
</td>

‎src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class AssignmentsTable extends Component {
120120
</tbody>
121121
</Table>
122122

123-
<Modal show={this.state.dialogAssignment !== null} backdrop="static" onHide={this.closeDialog} bsSize="large">
123+
<Modal show={this.state.dialogAssignment !== null} backdrop="static" onHide={this.closeDialog} size="large">
124124
{this.state.dialogAssignment && (
125125
<CommentThreadContainer
126126
threadId={this.state.dialogAssignment.id}

‎src/components/Assignments/ShadowAssignment/ShadowAssignmentsTable/ShadowAssignmentsTableRow.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ const ShadowAssignmentsTableRow = ({
6868
<td className="text-right shrink-col text-nowrap">
6969
{permissionHints.update && (
7070
<LinkContainer to={SHADOW_ASSIGNMENT_EDIT_URI_FACTORY(id)}>
71-
<Button bsSize="xs" variant="warning">
71+
<Button size="xs" variant="warning">
7272
<EditIcon gapRight />
7373
<FormattedMessage id="generic.edit" defaultMessage="Edit" />
7474
</Button>
7575
</LinkContainer>
7676
)}
7777

78-
{permissionHints.remove && <DeleteShadowAssignmentButtonContainer id={id} bsSize="xs" />}
78+
{permissionHints.remove && <DeleteShadowAssignmentButtonContainer id={id} size="xs" />}
7979
</td>
8080
</tr>
8181
);

‎src/components/Assignments/ShadowAssignmentPointsTable/ShadowAssignmentPointsTable.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class ShadowAssignmentPointsTable extends Component {
9797
{points === null ? (
9898
<td className="shrink-col text-nowrap text-right">
9999
{permissionHints.createPoints && (
100-
<Button variant="success" onClick={() => this.openDialog(student.id)} bsSize="xs">
100+
<Button variant="success" onClick={() => this.openDialog(student.id)} size="xs">
101101
<Icon gapRight icon={['far', 'star']} />
102102
<FormattedMessage
103103
id="app.shadowAssignmentPointsTable.createPointsButton"
@@ -109,7 +109,7 @@ class ShadowAssignmentPointsTable extends Component {
109109
) : (
110110
<td className="shrink-col text-nowrap text-right">
111111
{permissionHints.updatePoints && (
112-
<Button variant="warning" onClick={() => this.openDialog(student.id, pointsId)} bsSize="xs">
112+
<Button variant="warning" onClick={() => this.openDialog(student.id, pointsId)} size="xs">
113113
<EditIcon gapRight />
114114
<FormattedMessage
115115
id="app.shadowAssignmentPointsTable.updatePointsButton"
@@ -128,7 +128,7 @@ class ShadowAssignmentPointsTable extends Component {
128128
defaultMessage="Do you really wish to remove awarded points?"
129129
/>
130130
}>
131-
<Button variant="danger" bsSize="xs">
131+
<Button variant="danger" size="xs">
132132
<DeleteIcon gapRight />
133133
<FormattedMessage id="generic.remove" defaultMessage="Remove" />
134134
</Button>
@@ -141,7 +141,7 @@ class ShadowAssignmentPointsTable extends Component {
141141
})}
142142
</tbody>
143143
</Table>
144-
<Modal show={this.state.dialogOpen} backdrop="static" onHide={this.closeDialog} bsSize="large">
144+
<Modal show={this.state.dialogOpen} backdrop="static" onHide={this.closeDialog} size="large">
145145
<Modal.Header closeButton>
146146
<Modal.Title>
147147
<FormattedMessage

‎src/components/Assignments/SolutionsTable/SolutionsTableRow.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ const SolutionsTableRow = ({
139139
locale={locale}
140140
captionAsTooltip={compact}
141141
shortLabel={!compact}
142-
bsSize="xs"
142+
size="xs"
143143
/>
144-
<ReviewSolutionContainer id={id} locale={locale} captionAsTooltip={compact} bsSize="xs" />
144+
<ReviewSolutionContainer id={id} locale={locale} captionAsTooltip={compact} size="xs" />
145145
</React.Fragment>
146146
)}
147147

148148
{permissionHints && permissionHints.delete && (
149-
<DeleteSolutionButtonContainer id={id} groupId={groupId} bsSize="xs" captionAsTooltip={compact} />
149+
<DeleteSolutionButtonContainer id={id} groupId={groupId} size="xs" captionAsTooltip={compact} />
150150
)}
151151
</td>
152152
</tr>

‎src/components/Exercises/ExerciseButtons/ExerciseButtons.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ const ExerciseButtons = ({
2121
<div className="em-margin-bottom em-margin-right">
2222
<ButtonGroup>
2323
<LinkContainer to={EXERCISE_ASSIGNMENTS_URI_FACTORY(exerciseId)}>
24-
<Button variant="primary" bsSize="sm">
24+
<Button variant="primary" size="sm">
2525
<GroupIcon gapRight />
2626
<FormattedMessage id="app.exercise.assignments" defaultMessage="Assignments in Groups" />
2727
</Button>
2828
</LinkContainer>
2929

3030
{permissionHints && permissionHints.update && (
3131
<LinkContainer to={EXERCISE_EDIT_URI_FACTORY(exerciseId)}>
32-
<Button variant="warning" bsSize="sm">
32+
<Button variant="warning" size="sm">
3333
<EditIcon gapRight />
3434
<FormattedMessage id="app.exercise.editSettings" defaultMessage="Exercise Settings" />
3535
</Button>
@@ -38,7 +38,7 @@ const ExerciseButtons = ({
3838

3939
{permissionHints && permissionHints.viewPipelines && permissionHints.viewScoreConfig && (
4040
<LinkContainer to={EXERCISE_EDIT_CONFIG_URI_FACTORY(exerciseId)}>
41-
<Button variant={permissionHints.setScoreConfig ? 'warning' : 'default'} bsSize="sm">
41+
<Button variant={permissionHints.setScoreConfig ? 'warning' : 'default'} size="sm">
4242
<TestsIcon gapRight />
4343
<FormattedMessage id="app.exercise.editConfig" defaultMessage="Tests Configuration" />
4444
</Button>
@@ -47,7 +47,7 @@ const ExerciseButtons = ({
4747

4848
{permissionHints && permissionHints.viewLimits && (
4949
<LinkContainer to={EXERCISE_EDIT_LIMITS_URI_FACTORY(exerciseId)}>
50-
<Button variant={permissionHints.setLimits ? 'warning' : 'default'} bsSize="sm">
50+
<Button variant={permissionHints.setLimits ? 'warning' : 'default'} size="sm">
5151
<LimitsIcon gapRight />
5252
<FormattedMessage id="app.exercise.editLimits" defaultMessage="Tests Limits" />
5353
</Button>

‎src/components/Exercises/ExerciseGroups/ExerciseGroups.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ExerciseGroups extends Component {
2323
return (
2424
<Button
2525
variant="success"
26-
bsSize="xs"
26+
size="xs"
2727
disabled={Boolean(attachingGroupId)}
2828
onClick={ev => {
2929
ev.stopPropagation();
@@ -40,7 +40,7 @@ class ExerciseGroups extends Component {
4040
return (
4141
<Button
4242
variant="danger"
43-
bsSize="xs"
43+
size="xs"
4444
disabled={Boolean(detachingGroupId) || groupsIds.length <= 1 /* last one standing */}
4545
onClick={ev => {
4646
ev.stopPropagation();
@@ -90,7 +90,7 @@ class ExerciseGroups extends Component {
9090
</Table>
9191

9292
{showButtons && (
93-
<Modal show={this.state.dialogOpen} backdrop="static" onHide={this.closeDialog} bsSize="large">
93+
<Modal show={this.state.dialogOpen} backdrop="static" onHide={this.closeDialog} size="large">
9494
<Modal.Header closeButton>
9595
<Modal.Title>
9696
<FormattedMessage

‎src/components/Exercises/ExercisesListItem/ExercisesListItem.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const ExercisesListItem = ({
141141
<FormattedMessage id="app.exercises.listEdit" defaultMessage="Settings" />
142142
</Tooltip>
143143
}>
144-
<Button bsSize="xs" variant="warning">
144+
<Button size="xs" variant="warning">
145145
<EditIcon smallGapLeft smallGapRight />
146146
</Button>
147147
</OverlayTrigger>
@@ -156,7 +156,7 @@ const ExercisesListItem = ({
156156
<FormattedMessage id="app.exercises.listEditConfig" defaultMessage="Tests" />
157157
</Tooltip>
158158
}>
159-
<Button bsSize="xs" variant={permissionHints.setScoreConfig ? 'warning' : 'default'}>
159+
<Button size="xs" variant={permissionHints.setScoreConfig ? 'warning' : 'default'}>
160160
<TestsIcon smallGapLeft smallGapRight />
161161
</Button>
162162
</OverlayTrigger>
@@ -171,14 +171,14 @@ const ExercisesListItem = ({
171171
<FormattedMessage id="app.exercises.listEditLimits" defaultMessage="Limits" />
172172
</Tooltip>
173173
}>
174-
<Button bsSize="xs" variant={permissionHints.setLimits ? 'warning' : 'default'}>
174+
<Button size="xs" variant={permissionHints.setLimits ? 'warning' : 'default'}>
175175
<LimitsIcon smallGapLeft smallGapRight />
176176
</Button>
177177
</OverlayTrigger>
178178
</LinkContainer>
179179
)}
180180
{permissionHints.remove && (
181-
<DeleteExerciseButtonContainer id={id} bsSize="xs" resourceless captionAsTooltip onDeleted={reload} />
181+
<DeleteExerciseButtonContainer id={id} size="xs" resourceless captionAsTooltip onDeleted={reload} />
182182
)}
183183
</td>
184184
</tr>

‎src/components/Exercises/FilesTable/AttachmentFilesTableRow.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const AttachmentFilesTableRow = ({ id, name, size, uploadedAt, removeFile, links
3333
/>
3434
}
3535
className="pull-right">
36-
<Button bsSize="xs" variant="danger">
36+
<Button size="xs" variant="danger">
3737
<DeleteIcon gapRight />
3838
<FormattedMessage id="generic.delete" defaultMessage="Delete" />
3939
</Button>

0 commit comments

Comments
 (0)