Skip to content

Commit 95c0c76

Browse files
Merge branch 'master' into nmetulev/typescleanup
2 parents 3007a38 + 0443f6d commit 95c0c76

File tree

2 files changed

+53
-2
lines changed

2 files changed

+53
-2
lines changed

.github/workflows/build.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Build CI
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [10.x]
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
- run: npm i
28+
- run: npm pack
29+
- name: Upload a Build Artifact - package
30+
uses: actions/upload-artifact@v2
31+
with:
32+
name: npm-package
33+
path: microsoft-mgt-*.tgz
34+
- name: Upload a Build Artifact - bundle
35+
uses: actions/upload-artifact@v2
36+
with:
37+
name: bundle
38+
path: dist/bundle

src/components/mgt-login/mgt-login.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,19 @@ export class MgtLogin extends MgtBaseComponent {
228228
if (!this.userDetails) {
229229
return;
230230
}
231+
const avatarSize = 'large';
231232

232233
return html`
233234
<div class="popup">
234235
<div class="popup-content">
235236
<div>
236-
<mgt-person .personDetails=${this.userDetails} .personImage=${this._image} show-name show-email />
237+
<mgt-person
238+
.personDetails=${this.userDetails}
239+
.personImage=${this._image}
240+
.avatarSize=${avatarSize}
241+
show-name
242+
show-email
243+
/>
237244
</div>
238245
<div class="popup-commands">
239246
<ul>
@@ -257,8 +264,14 @@ export class MgtLogin extends MgtBaseComponent {
257264
*/
258265
protected renderButtonContent() {
259266
if (this.userDetails) {
267+
const avatarSize = 'small';
260268
return html`
261-
<mgt-person .personDetails=${this.userDetails} .personImage=${this._image} show-name />
269+
<mgt-person
270+
.personDetails=${this.userDetails}
271+
.personImage=${this._image}
272+
.avatarSize=${avatarSize}
273+
show-name
274+
/>
262275
`;
263276
} else {
264277
return html`

0 commit comments

Comments
 (0)