Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-3800' into 'master'

Browse Source 
RED-3800: Moved fullscreen icons to common-ui

Closes RED-3800

See merge request redactmanager/red-ui!468
This commit is contained in:
Dan Percic 2024-06-20 14:07:51 +02:00
commit 91ab867792
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.html
View File

@ -6,8 +6,8 @@
<!-- TODO: mode this file preview header to a separate component-->
<div #actionsWrapper class="flex-2 actions-container">
<div class="assignee" [class.documine]="isDocumine">
<div class="vertical-line" *ngIf="isDocumine"></div>
<div [class.documine]="isDocumine" class="assignee">
<div *ngIf="isDocumine" class="vertical-line"></div>
<redaction-processing-indicator [file]="file" class="mr-16"></redaction-processing-indicator>
@ -24,7 +24,7 @@
</ng-container>
</div>
<div class="vertical-line" *ngIf="!isDocumine"></div>
<div *ngIf="!isDocumine" class="vertical-line"></div>
<!-- TODO: mode these actions to a separate component -->
@ -33,8 +33,8 @@
[file]="file"
[helpModeKeyPrefix]="'editor'"
[minWidth]="width"
type="file-preview"
iqserDisableStopPropagation
type="file-preview"
></redaction-file-actions>
<iqser-circle-button
@ -49,7 +49,7 @@
<iqser-circle-button
(action)="toggleFullScreen()"
[attr.help-mode-key]="'editor_full_screen'"
[icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"
[icon]="fullScreen ? 'iqser:exit-fullscreen' : 'iqser:fullscreen'"
[tooltip]="'file-preview.fullscreen' | translate"
class="ml-2"
iqserDisableStopPropagation

2
apps/red-ui/src/app/modules/icons/icons.module.ts
View File

@ -49,9 +49,7 @@ export class IconsModule {
'exclude-pages',
'excluded-page',
'extract',
'exit-fullscreen',
'folder',
'fullscreen',
'html-file',
'info',
'import_redactions',

9
apps/red-ui/src/assets/icons/general/exit-fullscreen.svg
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd" id="minimize" stroke="none" stroke-width="1">
<path
d="M40,60 L40,90 L30,90 L30,77 L7,100 L0,93 L23,70 L10,70 L10,60 L40,60 Z M90,60 L90,70 L77,70 L100,93 L93,100 L70,77 L70,90 L60,90 L60,60 L90,60 Z M93,0 L100,7 L77,30 L90,30 L90,40 L60,40 L60,10 L70,10 L70,23 L93,0 Z M7,0 L30,23 L30,10 L40,10 L40,40 L10,40 L10,30 L23,30 L0,7 L7,0 Z"
fill="currentColor" fill-rule="nonzero" id="Combined-Shape"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 642 B

9
apps/red-ui/src/assets/icons/general/fullscreen.svg
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd" id="full-screen" stroke="none" stroke-width="1">
<path
d="M36.5,56.5 L43.5,63.5 L17,90 L30,90 L30,100 L0,100 L0,70 L10,70 L10,83 L36.5,56.5 Z M63.5,56.5 L90,83 L90,70 L100,70 L100,100 L70,100 L70,90 L83,90 L56.5,63.5 L63.5,56.5 Z M100,0 L100,30 L90,30 L90,17 L63.5,43.5 L56.5,36.5 L83,10 L70,10 L70,0 L100,0 Z M30,0 L30,10 L17,10 L43.5,36.5 L36.5,43.5 L10,17 L10,30 L0,30 L0,0 L30,0 Z"
fill="currentColor" fill-rule="nonzero" id="Combined-Shape"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

2
libs/common-ui

@ -1 +1 @@
Subproject commit f3faa6a6cc6b36840de6952f15938858130a4ef2
Subproject commit 590ebcbae2a8a358a52468511c3b60e366ef7e36