Conflicts

Author: atishdhu

src/core/jpeg_stream.js

@@ -94,7 +94,7 @@ class JpegStream extends DecodeStream {
       }
     }
     const jpegImage = new JpegImage(jpegOptions);
-    
+
     jpegImage.parse(bytes);
     const data = jpegImage.getData({
       width: this.drawWidth,

src/display/canvas.js

@@ -1515,7 +1515,7 @@ class CanvasGraphics {
           ctx.fillRect(0, 0, width, height);
           ctx.globalCompositeOperation = "source-over";
         }
-        
+
         maskCanvas = canvas.canvas;
         maskX = maskY = 0;
       } else if (backdrop.some(c => c !== 0)) {
@@ -3248,5 +3248,3 @@ for (const op in OPS) {
     CanvasGraphics.prototype[OPS[op]] = CanvasGraphics.prototype[op];
   }
 }
-
-export { CanvasGraphics };

web/viewer.css

@@ -515,7 +515,8 @@ body {
 
 .treeItemToggler::before {
   /* All matching images have a size of 16x16
-  * All relevant containers have a size of 28x28 */
+   * All relevant containers have a size of 28x28
+  */
   position: absolute;
   display: inline-block;
   width: 16px;
@@ -742,7 +743,7 @@ body {
 
 .thumbnail {
   /* Define these variables here, and not in :root, since the individual
-    thumbnails may have different sizes. */
+     thumbnails may have different sizes. */
   --thumbnail-width: 0;
   --thumbnail-height: 0;
 
@@ -1547,7 +1548,7 @@ dialog :link {
 
   &::after {
     /* All matching images have a size of 16x16
-    * All relevant containers have a size of 28x28 */
+     * All relevant containers have a size of 28x28 */
     position: absolute;
     display: inline;
     width: var(--icon-size);
@@ -1607,7 +1608,7 @@ dialog :link {
 
   #loadingBar {
     /* Define these variables here, and not in :root, to avoid reflowing the
-      entire viewer when updating progress (see issue 15958). */
+       entire viewer when updating progress (see issue 15958). */
     --progressBar-percent: 0%;
     --progressBar-end-offset: 0;