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.

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

Misc updates #400

Merged
merged 2 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<th cdk-header-cell *cdkHeaderCellDef></th>
<td cdk-cell *cdkCellDef="let item; let index = index">
<button
class="btn dropdown-toggle dropdown-toggle-hide-caret shadow-none py-0 ps-3"
class="btn btn-text dropdown-toggle dropdown-toggle-hide-caret py-0"
type="button"
[attr.aria-controls]="getMenuId(index)"
[cdkMenuTriggerData]="{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
.cdk-cell {
width: 50px;

button.dropdown-toggle {
border: 0;

&:hover {
color: var(--bs-link-hover-color);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button
class="dropdown-toggle dropdown-toggle-hide-caret"
class="btn btn-text dropdown-toggle dropdown-toggle-hide-caret px-2"
type="button"
cdkOverlayOrigin
#trigger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button
class="dropdown-toggle dropdown-toggle-hide-caret"
class="btn btn-text dropdown-toggle dropdown-toggle-hide-caret px-2"
type="button"
cdkOverlayOrigin
#trigger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button
class="dropdown-toggle dropdown-toggle-hide-caret"
class="btn btn-text dropdown-toggle dropdown-toggle-hide-caret px-2"
type="button"
cdkOverlayOrigin
#trigger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button
class="dropdown-toggle dropdown-toggle-hide-caret"
class="btn btn-text dropdown-toggle dropdown-toggle-hide-caret px-2"
type="button"
cdkOverlayOrigin
#trigger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="text-nowrap">
<button class="px-0" type="button">
<button class="btn btn-text px-0" type="button">
<ng-content />

@if (sortable()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ <h1 skipTo>EUAs</h1>
<ng-container cdkColumnDef="title">
<th asy-sort-header cdk-header-cell *cdkHeaderCellDef>Title</th>
<td class="hide-overflow" cdk-cell *cdkCellDef="let eua">
<a [routerLink]="['/admin/eua', eua._id]">{{ eua.title }}</a>
<a class="btn btn-link p-0" [routerLink]="['/admin/eua', eua._id]">
{{ eua.title }}
</a>
</td>
</ng-container>
<ng-container cdkColumnDef="text">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ <h1 skipTo>System Feedback</h1>
</th>
<td cdk-cell *cdkCellDef="let feedback">
<button
class="btn dropdown-toggle"
class="btn btn-text dropdown-toggle p-0"
id="feedback-{{ feedback._id }}-status-menu-btn"
type="button"
attr.aria-controls="feedback-{{ feedback._id }}-status-menu"
Expand Down Expand Up @@ -151,7 +151,7 @@ <h1 skipTo>System Feedback</h1>
<th asy-sort-header cdk-header-cell *cdkHeaderCellDef>Assignee</th>
<td cdk-cell *cdkCellDef="let feedback">
<button
class="btn dropdown-toggle"
class="btn btn-text dropdown-toggle p-0"
id="feedback-{{ feedback._id }}-assignee-menu-btn"
type="button"
attr.aria-controls="feedback-{{ feedback._id }}-assignee-menu"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ <h1 skipTo>Messages</h1>
<ng-container cdkColumnDef="title">
<th asy-sort-header cdk-header-cell *cdkHeaderCellDef>Title</th>
<td cdk-cell *cdkCellDef="let message">
<a [routerLink]="['/admin/message', message._id]">{{ message.title }}</a>
<a class="btn btn-link p-0" [routerLink]="['/admin/message', message._id]">
{{ message.title }}
</a>
</td>
</ng-container>
<asy-text-column name="type" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ <h1 skipTo>Users</h1>
<ng-container cdkColumnDef="name">
<th asy-sort-header cdk-header-cell *cdkHeaderCellDef>Name</th>
<td class="text-nowrap" cdk-cell *cdkCellDef="let user">
<a [routerLink]="['/admin/user', user._id]">{{ user.name }}</a>
<a class="btn btn-link p-0" [routerLink]="['/admin/user', user._id]">
{{ user.name }}
</a>
</td>
</ng-container>
<asy-text-column name="username" [sortable]="false" />
Expand Down Expand Up @@ -87,7 +89,9 @@ <h1 skipTo>Users</h1>
</ng-container>
<asy-expandable-list-column name="teams">
<ng-template lc-item-tmp let-team="listItem">
<a [routerLink]="['/team', team._id]">{{ team.team.name }}</a>
<a class="btn btn-link p-0" [routerLink]="['/team', team._id]">
{{ team.team.name }}
</a>
</ng-template>
</asy-expandable-list-column>
<asy-actions-menu-column scope="user" stickyEnd>
Expand Down
5 changes: 4 additions & 1 deletion src/app/core/errors/access.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { Router } from '@angular/router';
<div class="p-5 text-center bg-body-tertiary rounded-3">
<h1 class="text-body-emphasis">{{ status }}</h1>
<p class="load">{{ message }}</p>
<p>Once your account is updated, <a href="/">go back home</a> and try again.</p>
<p>
Once your account is updated,
<a class="btn btn-link p-0" href="/">go back home</a> and try again.
</p>
</div>
`,
standalone: true,
Expand Down
10 changes: 7 additions & 3 deletions src/app/core/help/getting-started/external-links.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<ul>
@for (link of links(); track link) {
<li>
<a href="{{ link.href }}" target="_blank" (click)="handleLinkClick($event)">{{
link.title
}}</a>
<a
class="btn btn-link p-0"
href="{{ link.href }}"
target="_blank"
(click)="handleLinkClick($event)"
>{{ link.title }}</a
>
- {{ link.description }}
</li>
}
Expand Down
5 changes: 3 additions & 2 deletions src/app/core/signup/signed-up.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ <h2 class="col-md-12 text-center">Thanks for requesting an account!</h2>
active.
</p>
<p class="col-md-4 offset-4 text-center">
You can hang tight for a bit, or <a [routerLink]="['/']">go back home</a> to see if your
account is ready...
You can hang tight for a bit, or
<a class="btn btn-link p-0" routerLink="/">go back home</a> to see if your account is
ready...
</p>
</div>
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3 class="pt-2">Set user roles</h3>
<th cdk-header-cell *cdkHeaderCellDef>Role</th>
<td cdk-cell *cdkCellDef="let member">
<button
class="btn dropdown-toggle p-0"
class="btn btn-text dropdown-toggle p-0"
id="add-member-{{ member._id }}-role-menu-btn"
type="button"
attr.aria-controls="add-member-{{ member._id }}-role-menu"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<td cdk-cell *cdkCellDef="let member">
@if (isTeamAdmin()) {
<button
class="btn dropdown-toggle p-0"
class="btn btn-text dropdown-toggle p-0"
id="member-{{ member._id }}-role-menu-btn"
type="button"
attr.aria-controls="member-{{ member._id }}-role-menu"
Expand Down
4 changes: 3 additions & 1 deletion src/app/core/teams/list-teams/list-teams.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ <h1 skipTo>Teams</h1>
<ng-container cdkColumnDef="name">
<th asy-sort-header cdk-header-cell *cdkHeaderCellDef>Name</th>
<td class="text-nowrap" cdk-cell *cdkCellDef="let team">
<a [routerLink]="['/team', team._id]">{{ team.name }}</a>
<a class="btn btn-link p-0" [routerLink]="['/team', team._id]">
{{ team.name }}
</a>
</td>
</ng-container>
<asy-ago-date-column name="created" />
Expand Down
5 changes: 5 additions & 0 deletions src/styles/bootstrap/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@ $btn-submit-linear-animation: $btn-submit-linear-animation-name
}
}
}

.btn.btn-text {
--bs-btn-box-shadow: 0 0 0 #000;
--bs-btn-focus-shadow-rgb: #{$btn-link-focus-shadow-rgb};
}
1 change: 0 additions & 1 deletion src/styles/bootstrap/_dropdowns.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.dropdown-toggle.dropdown-toggle-hide-caret {
&::after {
content: none;
Expand Down
Loading