Skip to content

Commit 1aaf8d3

Browse files
nsemetsbodintsov
authored andcommitted
[ENG-9627] Project Overview: OSF Storage button does not have sufficient size or spacing. CenterForOpenScience#828
- Ticket: [ENG-9627] - Feature flag: n/a ## Summary of Changes 1. Fixed accessibility issue with spacing. 2. Fixed accessibility issue with landmark.
1 parent 36daedf commit 1aaf8d3

5 files changed

Lines changed: 27 additions & 14 deletions

File tree

src/app/core/components/layout/layout.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="layout" [class.layout-desktop]="isWeb()" [class.layout-tablet]="!isWeb()">
1+
<main class="layout" [class.layout-desktop]="isWeb()" [class.layout-tablet]="!isWeb()">
22
@if (isWeb()) {
33
<osf-sidenav></osf-sidenav>
44
}
@@ -19,7 +19,7 @@
1919

2020
<osf-footer></osf-footer>
2121
</div>
22-
</div>
22+
</main>
2323

2424
<p-confirm-dialog
2525
id="dialog"

src/app/features/project/overview/components/files-widget/files-widget.component.html

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ <h2>{{ 'project.overview.files.filesPreview' | translate }}</h2>
1818
<p-tabs [value]="currentRootFolder()?.folder?.id || ''" (valueChange)="onStorageChange($event)" scrollable>
1919
<p-tablist>
2020
@for (option of storageAddons(); track option.folder.id) {
21-
<p-tab class="p-2" [value]="option.folder.id">
22-
<p-button
23-
severity="contrast"
24-
variant="text"
25-
[styleClass]="option.folder.id === currentRootFolder()?.folder?.id ? 'text-600' : 'text-500'"
26-
[disabled]="isFilesLoading()"
27-
[label]="option.label"
28-
[raised]="option.folder.id === currentRootFolder()?.folder?.id"
21+
<p-tab class="addon-tab p-2" [value]="option.folder.id" [disabled]="isFilesLoading()">
22+
<div
23+
class="addon-option border-round-lg font-bold"
24+
[class.p-button-raised]="option.folder.id === currentRootFolder()?.folder?.id"
25+
[class.selected]="option.folder.id === currentRootFolder()?.folder?.id"
2926
>
30-
</p-button>
27+
{{ option.label }}
28+
</div>
3129
</p-tab>
3230
}
3331
</p-tablist>

src/app/features/project/overview/components/files-widget/files-widget.component.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,19 @@
22
border: 1px solid var(--grey-2);
33
border-radius: 0.75rem;
44
}
5+
6+
.addon-tab:hover {
7+
.addon-option {
8+
background-color: var(--grey-3);
9+
}
10+
}
11+
12+
.addon-option {
13+
color: var(--grey-4);
14+
line-height: 1.5rem;
15+
padding: 0.625rem 1rem;
16+
17+
&.selected {
18+
color: var(--dark-blue-1);
19+
}
20+
}

src/app/features/project/overview/components/files-widget/files-widget.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createDispatchMap, select } from '@ngxs/store';
22

33
import { TranslatePipe } from '@ngx-translate/core';
44

5-
import { Button } from 'primeng/button';
65
import { Skeleton } from 'primeng/skeleton';
76
import { TabsModule } from 'primeng/tabs';
87

@@ -45,7 +44,7 @@ import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-h
4544

4645
@Component({
4746
selector: 'osf-files-widget',
48-
imports: [TranslatePipe, SelectComponent, TabsModule, FilesTreeComponent, Button, Skeleton],
47+
imports: [TranslatePipe, SelectComponent, TabsModule, FilesTreeComponent, Skeleton],
4948
templateUrl: './files-widget.component.html',
5049
styleUrl: './files-widget.component.scss',
5150
changeDetection: ChangeDetectionStrategy.OnPush,

src/styles/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ $base-font-size: 16px;
9191
--p-form-field-hover-border-color: var(--grey-1);
9292
--p-form-field-disabled-background: var(--white);
9393
--p-form-field-disabled-color: var(--grey-1);
94-
--p-form-field-placeholder-color: var(--grey-1);
94+
--p-form-field-placeholder-color: var(--grey-4);
9595
--p-list-option-color: var(--dark-blue-1);
9696
--p-list-option-focus-color: var(--dark-blue-1);
9797
--p-list-option-focus-background: var(--bg-blue-3);

0 commit comments

Comments
 (0)