PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into dbkr/edit_pr_desc

Browse source
This commit is contained in:
David Baker 2021-08-11 21:39:07 +01:00
commit 002c7328f3
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/layered-build.yaml vendored
View file

@ -20,12 +20,12 @@ jobs:
with: with:
script: | script: |
var fs = require('fs'); var fs = require('fs');
fs.writeFileSync('${{github.workspace}}/context.json', JSON.stringify(context)); fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
- name: Upload Context - name: Upload PR Info
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: context.json name: pr.json
path: context.json path: pr.json
# We'll only use this in a triggered job, then we're done with it # We'll only use this in a triggered job, then we're done with it
retention-days: 1 retention-days: 1

16
.github/workflows/netflify.yaml vendored
View file

@ -34,27 +34,27 @@ jobs:
var fs = require('fs'); var fs = require('fs');
fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data)); fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
var contextArtifact = artifacts.data.artifacts.filter((artifact) => { var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
return artifact.name == "context.json" return artifact.name == "pr.json"
})[0]; })[0];
var download = await github.actions.downloadArtifact({ var download = await github.actions.downloadArtifact({
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
artifact_id: contextArtifact.id, artifact_id: prInfoArtifact.id,
archive_format: 'zip', archive_format: 'zip',
}); });
var fs = require('fs'); var fs = require('fs');
fs.writeFileSync('${{github.workspace}}/context.json.zip', Buffer.from(download.data)); fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
- name: Extract Artifacts - name: Extract Artifacts
run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip context.json && rm context.json.zip run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
- name: 'Read Context' - name: 'Read PR Info'
id: readctx id: readctx
uses: actions/github-script@v3.1.0 uses: actions/github-script@v3.1.0
with: with:
script: | script: |
var fs = require('fs'); var fs = require('fs');
var ctx = JSON.parse(fs.readFileSync('${{github.workspace}}/context.json')); var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
console.log(`::set-output name=prnumber::${ctx.payload.pull_request.number}`); console.log(`::set-output name=prnumber::${pr.number}`);
- name: Deploy to Netlify - name: Deploy to Netlify
id: netlify id: netlify
uses: nwtgck/actions-netlify@v1.2 uses: nwtgck/actions-netlify@v1.2

4
res/css/views/rooms/_EventTile.scss
View file

@ -489,6 +489,10 @@ $hover-select-border: 4px;
// https://github.com/vector-im/vector-web/issues/754 // https://github.com/vector-im/vector-web/issues/754
overflow-x: overlay; overflow-x: overlay;
overflow-y: visible; overflow-y: visible;
&::-webkit-scrollbar-corner {
background: transparent;
}
} }
} }