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

Jump to bottom

[#12269] Instructor edit sessions page: Fix add question button overflow. #12477

Merged
merged 15 commits into from
Jul 2, 2023
Merged

[#12269] Instructor edit sessions page: Fix add question button overflow. #12477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b71443a
fixed overlapping button issue
singhabhyudita Jun 16, 2023
c51b8ce
Overflow fixed
singhabhyudita Jun 19, 2023
1aec748
Updating failing checks
singhabhyudita Jun 19, 2023
66e75f8
Reduced padding at ends and for the info button
singhabhyudita Jun 22, 2023
97f02b3
Corresponding snapshots updated
singhabhyudita Jun 22, 2023
b6f8889
Padding changed to horizontal axis
singhabhyudita Jun 27, 2023
fae9e81
Merge branch 'master' into master
singhabhyudita Jun 27, 2023
440822d
Merge branch 'master' of https://github.com/TEAMMATES/teammates
singhabhyudita Jun 27, 2023
11f0dd9
Merge branch 'master' of https://github.com/singhabhyudita/teammates
singhabhyudita Jun 27, 2023
f17341d
snapshots updated
singhabhyudita Jun 27, 2023
c8f8e6c
custom styling added
singhabhyudita Jun 27, 2023
d1e20fa
Merge branch 'master' of https://github.com/TEAMMATES/teammates
singhabhyudita Jun 28, 2023
202899f
Merge branch 'master' into master
singhabhyudita Jun 29, 2023
fc5c267
Merge branch 'master' of https://github.com/TEAMMATES/teammates
singhabhyudita Jun 29, 2023
1383d61
Merge branch 'master' of https://github.com/singhabhyudita/teammates
singhabhyudita Jun 29, 2023
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
10 changes: 5 additions & 5 deletions src/web/app/components/adding-question-panel/adding-question-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="card-body background-color-light-blue text-center">
<div class="card-body background-color-light-blue text-center responsive-padding">
<div ngbDropdown class="d-inline-block">
<button id="btn-new-question" class="btn btn-primary" ngbDropdownToggle>Add New Question</button>
<button id="btn-new-question" class="btn btn-primary btn-small-padding" ngbDropdownToggle>Add New Question</button>
<div id="new-question-dropdown" ngbDropdownMenu>
<button class="dropdown-item" (click)="templateQuestionModalHandler()">Choose from template questions</button>
<div class="dropdown-divider"></div>
Expand All @@ -20,11 +20,11 @@
</ng-container>
</div>
</div>
<a type="button" class="btn btn-link" *ngIf="!isLinkDisabled" target="_blank" rel="noopener noreferrer"
<a type="button" class="btn btn-link px-1 px-sm-3" *ngIf="!isLinkDisabled" target="_blank" rel="noopener noreferrer"
tmRouterLink="/web/instructor/help" [queryParams]="{questionId: 'questions', section: 'questions'}" aria-label="Help for questions">
<i class="fas fa-info-circle"></i>
</a>
<a type="button" class="btn btn-link" *ngIf="isLinkDisabled"><i class="fas fa-info-circle"></i></a>
<button id="btn-copy-question" class="btn btn-primary" (click)="copyQuestionsFromOtherSessionsHandler()"
<a type="button" class="btn btn-link px-1 px-sm-3" *ngIf="isLinkDisabled"><i class="fas fa-info-circle"></i></a>
<button id="btn-copy-question" class="btn btn-primary btn-small-padding" (click)="copyQuestionsFromOtherSessionsHandler()"
[disabled]="isCopyingQuestion"><tm-ajax-loading *ngIf="isCopyingQuestion"></tm-ajax-loading>Copy Question</button>
</div>
13 changes: 13 additions & 0 deletions src/web/app/components/adding-question-panel/adding-question-panel.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
.background-color-light-blue {
background-color: #EAEFF5;
}

.responsive-padding {
padding-left: 5px;
padding-right: 5px;
}

@media (max-width: 576px) {
// prevent overflow for small screen sizes
.btn-small-padding {
padding-left: .5rem;
padding-right: .5rem;
}
}
8 changes: 4 additions & 4 deletions ...uctor-session-edit-page/__snapshots__/instructor-session-edit-page.component.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,15 +2738,15 @@ exports[`InstructorSessionEditPageComponent should snap with feedback session qu
>
<tm-adding-question-panel>
<div
class="card-body background-color-light-blue text-center"
class="card-body background-color-light-blue text-center responsive-padding"
>
<div
class="d-inline-block"
ngbdropdown=""
>
<button
aria-expanded="false"
class="dropdown-toggle btn btn-primary"
class="dropdown-toggle btn btn-primary btn-small-padding"
id="btn-new-question"
ngbdropdowntoggle=""
>
Expand Down Expand Up @@ -3019,7 +3019,7 @@ exports[`InstructorSessionEditPageComponent should snap with feedback session qu
</div>
<a
aria-label="Help for questions"
class="btn btn-link"
class="btn btn-link px-1 px-sm-3"
href="/web/instructor/help?questionId=questions&section=questions"
rel="noopener noreferrer"
target="_blank"
Expand All @@ -3031,7 +3031,7 @@ exports[`InstructorSessionEditPageComponent should snap with feedback session qu
/>
</a>
<button
class="btn btn-primary"
class="btn btn-primary btn-small-padding"
id="btn-copy-question"
>
Copy Question
Expand Down
Loading