Skip to content

Commit

Permalink
General: Fix hover background issue for certain buttons (#10210)
Browse files Browse the repository at this point in the history
  • Loading branch information
laxerhd authored Feb 2, 2025
1 parent 9e33c00 commit 4e9d104
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ <h4 class="modal-title">
}
<div class="flex-grow-1 d-flex justify-content-end gap-2">
@if (!isImportDone) {
<button type="button" class="btn btn-default cancel" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary cancel" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h4 class="modal-title">
}
<div class="flex-grow-1 d-flex justify-content-end">
@if (!hasParsed) {
<button type="button" class="btn btn-default cancel me-2" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary cancel me-2" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ <h4 class="modal-title" jhiTranslate="entity.exportRepos.title"></h4>
}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="clear()">
<span class="glyphicon glyphicon-ban-circle"></span>&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.editor.fileBrowser.deleteFolder
}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" (click)="closeModal()">
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="closeModal()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button type="submit" class="btn btn-danger" [disabled]="!deleteForm.valid">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h4 class="control-label" jhiTranslate="artemisApp.result.scorePercentage"></h4>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button type="submit" [disabled]="editForm.invalid || isSaving" class="btn btn-primary">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.instructorDashboard.exportSubmi
</ng-container>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="clear()">
<span class="glyphicon glyphicon-ban-circle"></span>&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h4 class="modal-title">
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default cancel" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary cancel" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button type="submit" [disabled]="editForm.invalid || isSaving || teamSizeViolationUnconfirmed" class="btn btn-primary">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ <h4 class="modal-title">
</div>
}
<div class="flex-grow-1 d-flex justify-content-end">
<button type="button" class="btn btn-default cancel" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary cancel" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
@if (importStrategy !== ImportStrategy.PURGE_EXISTING) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ <h4 jhiTranslate="artemisApp.lecture.attachments.editAttachment"></h4>
<fa-icon [icon]="faPaperclip" />&nbsp;
<span jhiTranslate="entity.action.saveAttachment"></span>
</button>
<button type="button" (click)="cancel()" class="btn btn-default">
<button type="button" (click)="cancel()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h2 id="page-heading">
>
<span jhiTranslate="entity.action.submit"></span>
</button>
<button (click)="cancelSplit()" class="btn btn-default"><fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
<button (click)="cancelSplit()" class="btn btn-secondary"><fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
@if (invalidUnitTableMessage) {
<div class="alert alert-warning mt-3">
<fa-icon [icon]="faExclamationTriangle" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
</div>
<div class="col-sm-6 mx-auto text-end">
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default"><fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
<button type="button" (click)="cancelForm()" class="btn btn-secondary"><fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
}
<button
id="createButton"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<span jhiTranslate="entity.action.submit"></span>
</button>
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<button type="button" (click)="cancelForm()" class="btn btn-secondary">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h4>
<div>
<a
type="button"
class="btn btn-default"
class="btn btn-secondary"
[routerLink]="
attachment()
? ['/course-management', course()!.id, 'lectures', attachment()!.lecture!.id, 'attachments']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h4 class="modal-title">
</div>
<div class="modal-footer justify-content-between">
<div class="flex-grow-1 d-flex justify-content-end">
<button type="button" class="btn btn-default cancel me-1" data-dismiss="modal" (click)="cancel()">
<button type="button" class="btn btn-secondary cancel me-1" data-dismiss="modal" (click)="cancel()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button class="btn btn-success" id="finish-button" (click)="onFinish()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ <h4 class="modal-title">
}
<div class="flex-grow-1 d-flex justify-content-end">
@if (!hasImported) {
<button type="button" class="btn btn-default cancel me-2" data-dismiss="modal" (click)="clear()">
<button type="button" class="btn btn-secondary cancel me-2" data-dismiss="modal" (click)="clear()">
<fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
<button type="submit" id="import" name="importButton" class="btn btn-primary" [disabled]="isSubmitDisabled" (click)="importUsers()">
Expand Down

0 comments on commit 4e9d104

Please sign in to comment.