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

Fix unknown style #5810

Merged
merged 4 commits into from
Jun 24, 2020
Merged

Fix unknown style #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2fc2ec
fix unknown style
eromano Jun 23, 2020
64fc829
missing var
eromano Jun 23, 2020
4cb9a49
remove delete because there is already delete site
eromano Jun 23, 2020
d24a71e
fix test
eromano Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ describe('Viewer', () => {
await contentServicesPage.goToDocumentList();
});

afterAll(async () => {
await uploadActions.deleteFileOrFolder(excelFolderUploaded.entry.id);
});

it('[C280008] Should be possible to open any Excel file', async () => {
await contentServicesPage.doubleClickRow('excel');
for (const currentFile of uploadedExcels) {
Expand Down
4 changes: 0 additions & 4 deletions e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ describe('Viewer', () => {
await contentServicesPage.goToDocumentList();
});

afterAll(async () => {
await uploadActions.deleteFileOrFolder(imgFolderUploaded.entry.id);
});

it('[C279966] Should be possible to open any Image supported extension', async () => {
await contentServicesPage.doubleClickRow('images');
for (const image of uploadedImages) {
Expand Down
4 changes: 0 additions & 4 deletions e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ describe('Viewer', () => {
await contentServicesPage.goToDocumentList();
});

afterAll(async () => {
await uploadActions.deleteFileOrFolder(pptFolderUploaded.entry.id);
});

it('[C280009] Should be possible to open any PowerPoint file', async () => {
await contentServicesPage.doubleClickRow('ppt');

Expand Down
4 changes: 0 additions & 4 deletions e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ describe('Viewer', () => {
await contentServicesPage.goToDocumentList();
});

afterAll(async () => {
await uploadActions.deleteFileOrFolder(textFolderUploaded.entry.id);
});

it('[C280010] Should be possible to open any Text file', async () => {
await contentServicesPage.doubleClickRow('text');
for (const currentFile of uploadedTexts) {
Expand Down
4 changes: 0 additions & 4 deletions e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ describe('Viewer', () => {
await contentServicesPage.goToDocumentList();
});

afterAll(async () => {
await uploadActions.deleteFileOrFolder(wordFolderUploaded.entry.id);
});

it('[C280011] Should be possible to open any Word file', async () => {
await contentServicesPage.doubleClickRow('word');
for (const currentFile of uploadedWords) {
Expand Down
2 changes: 2 additions & 0 deletions lib/core/styles/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
@import '../viewer/components/pdf-viewer-thumbnails.component';
@import '../viewer/components/txt-viewer.component';
@import '../viewer/components/img-viewer.component';
@import '../viewer/components/unknown-format/unknown-format.component';
@import '../form/components/form-renderer.component';
@import '../layout/components/sidebar-action/sidebar-action-menu.component';
@import '../layout/components/header/header.component';
Expand Down Expand Up @@ -58,6 +59,7 @@
@include adf-pdf-viewer-theme($theme);
@include adf-pdf-thumbnails-theme($theme);
@include adf-image-viewer-theme($theme);
@include adf-unknown-viewer-theme($theme);
@include adf-text-viewer-theme($theme);
@include adf-form-renderer-theme($theme);
@include adf-sidebar-action-menu-theme($theme);
Expand Down
2 changes: 1 addition & 1 deletion lib/core/viewer/components/unknown-format/unknown-format.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="adf-viewer__unknown-format-view">
<div>
<mat-icon class="icon">error</mat-icon>
<div class="label">{{ 'ADF_VIEWER.UNKNOWN_FORMAT' | translate }}</div>
<div class="adf-viewer__unknown-label">{{ 'ADF_VIEWER.UNKNOWN_FORMAT' | translate }}</div>
</div>
</div>
24 changes: 17 additions & 7 deletions lib/core/viewer/components/unknown-format/unknown-format.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
.adf-viewer__unknown-format-view {
height: 90vh;
text-align: center;
display: flex;
flex: 1;
flex-direction: column;
justify-content: center;
@import '~@angular/material/theming';

@mixin adf-unknown-viewer-theme($theme) {
$foreground: map-get($theme, foreground);

.adf-viewer__unknown-format-view {
height: 90vh;
text-align: center;
display: flex;
flex: 1;
flex-direction: column;
justify-content: center;

.adf-viewer__unknown-label {
color: mat-color($foreground, text);
}
}
}
2 changes: 1 addition & 1 deletion lib/testing/src/lib/core/pages/viewer.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ export class ViewerPage {
}

async getUnknownFormatMessage(): Promise<string> {
const unknownFormatLabel = this.unknownFormat.element(by.css(`.label`));
const unknownFormatLabel = this.unknownFormat.element(by.css(`.adf-viewer__unknown-label`));
return BrowserActions.getText(unknownFormatLabel);
}
}