[pull] master from nextcloud:master

.github/workflows/nodejs.yml

@@ -1,30 +1,53 @@
-name: Node CI
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Node
 
 on:
   pull_request:
   push:
     branches:
       - master
       - stable*
+
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [12.x]
-
+    name: node
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: npm install, build
-      run: |
-        npm ci
-        npm run build --if-present
-    - name: npm test
-      run: |
-        npm test
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Read package.json node and npm engines version
+        uses: skjnldsv/read-package-engines-version-actions@v1.1
+        id: versions
+        with:
+          fallbackNode: '^12'
+          fallbackNpm: '^6'
+
+      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+      - name: Install dependencies & build
+        run: |
+          npm ci
+          npm run build --if-present
+
+      - name: Check webpack build changes
+        run: |
+          bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1"
+
+      - name: Show changes on failure
+        if: failure()
+        run: |
+          git status
+          git --no-pager diff
+

css/viewer.scss

@@ -21,6 +21,13 @@
 	background-image: url('../img/x-office-presentation.svg');
 }
 
+.icon-collabora {
+	opacity: 0.6;
+	&:hover {
+		opacity: 1;
+	}
+}
+
 .richdocuments-sharing .icon-shared {
 	display: block;
 	width: 16px;

lib/Controller/TemplatesController.php

@@ -195,11 +195,11 @@ public function delete($fileId) {
 	 */
 	private function fetchPreview(
 		Node $node,
-		$x,
-		$y,
-		$a = false,
-		$forceIcon = true,
-		string $mode): Http\Response {
+		int $x,
+		int $y,
+		bool $a = false,
+		bool $forceIcon = true,
+		string $mode = IPreview::MODE_FILL): Http\Response {
 
 		if (!($node instanceof Node) || (!$forceIcon && !$this->preview->isAvailable($node))) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);