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

Pull request #126: Updated exit fullscreen icon & small improvements

Browse Source 
Merge in RED/ui from RED-1176 to master

* commit '825272b03fa9042b781f7cb342c224a3a214316b':
  Updated exit fullscreen icon & small improvements
This commit is contained in:
Timo Bejan 2021-03-18 08:55:33 +01:00
commit 385abd93ae
3 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
View File

@ -130,11 +130,13 @@
<div class="vertical-line"></div>
<redaction-file-actions (actionPerformed)="fileActionPerformed($event)" *ngIf="viewReady"></redaction-file-actions>
<redaction-circle-button
(action)="toggleFullScreen()"
[icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"
tooltip="file-preview.fullscreen"
tooltipPosition="before"
class="ml-2"
></redaction-circle-button>
<!-- Dev Mode Features-->
@ -168,6 +170,7 @@
<!-- End Dev Mode Features-->
<redaction-circle-button
*ngIf="!fullScreen"
[routerLink]="['/ui/projects/' + appStateService.activeProjectId]"
(action)="closeFullScreen()"
class="ml-8"

4
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
View File

@ -177,6 +177,10 @@ redaction-dictionary-annotation-icon {
margin-left: 8px;
}
.ml-2 {
margin-left: 2px;
}
.skipped-toggle-button {
position: absolute;
right: 0;

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

@ -1,45 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<g>
<g id="fullscreen_x5F_exit">
<g>
<polygon style="fill:#030104;" points="24.586,27.414 29.172,32 32,29.172 27.414,24.586 32,20 20,20 20,32 "/>
<polygon style="fill:#030104;" points="0,12 12,12 12,0 7.414,4.586 2.875,0.043 0.047,2.871 4.586,7.414 "/>
<polygon style="fill:#030104;" points="0,29.172 2.828,32 7.414,27.414 12,32 12,20 0,20 4.586,24.586 "/>
<polygon style="fill:#030104;" points="20,12 32,12 27.414,7.414 31.961,2.871 29.133,0.043 24.586,4.586 20,0 "/>
</g>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>minimize</title>
<g id="minimize" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<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" id="Combined-Shape" fill="currentColor" fill-rule="nonzero"></path>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 684 B