Skip to content

Commit 29fbe7b

Browse files
committed
Revert input group separation
1 parent 07350f1 commit 29fbe7b

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

src/app/components/elements/panels/TeacherConnections.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,9 @@ export const TeacherConnections = ({user, authToken, editingOtherUser, userToEdi
182182
e.preventDefault();
183183
}}}
184184
/>
185-
<div className="input-group-append">
186-
<RS.Button onClick={processToken} className={classNames("py-2", {"px-0 border-dark h-100": isPhy})} color="secondary" outline disabled={editingOtherUser}>
187-
Connect
188-
</RS.Button>
189-
</div>
185+
<RS.Button onClick={processToken} className={classNames("py-2", {"px-0 border-dark h-100": isPhy})} color="secondary" outline disabled={editingOtherUser}>
186+
Connect
187+
</RS.Button>
190188
</RS.InputGroup>
191189
</RS.Form>
192190

src/app/components/pages/SetAssignments.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,9 @@ export const SetAssignments = () => {
538538
You have no {siteSpecific("gameboards", "quizzes")} to assign
539539
{siteSpecific(
540540
"; use one of the options above to find one.",
541-
<Button className={"ms-3"} tag={Link} to={PATHS.GAMEBOARD_BUILDER} onClick={() => setAssignBoardPath(PATHS.SET_ASSIGNMENTS)} size="sm" color="secondary">
541+
<><br /><Button className={"mt-3"} tag={Link} to={PATHS.GAMEBOARD_BUILDER} onClick={() => setAssignBoardPath(PATHS.SET_ASSIGNMENTS)} color="secondary">
542542
Create a quiz
543-
</Button>
543+
</Button></>
544544
)}
545545
</h3>
546546
: <>

src/scss/cs/button.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,9 @@
276276
input {
277277
border-radius: 0.25rem !important;
278278
}
279-
.input-group-append {
279+
button {
280280
margin-left: 1rem !important;
281-
button {
282-
border-radius: 50px !important;
283-
}
281+
border-radius: 50px !important;
284282
}
285283
}
286284

src/scss/phy/button.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,7 @@ button.close { // default <button class="close"/> components;
395395
input {
396396
border-radius: 0.25rem;
397397
}
398-
.input-group-append {
399-
button {
400-
border-radius: 0 0.25rem 0.25rem 0;
401-
}
398+
button {
399+
border-radius: 0 0.25rem 0.25rem 0;
402400
}
403401
}

0 commit comments

Comments
 (0)