Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JS] Media element support #1864

Merged
merged 3 commits into from Sep 7, 2018
Merged

[JS] Media element support #1864

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6521392
Media element support
dclaux Sep 6, 2018
1c77c1d
Merge branch 'master' into html-media
dclaux Sep 6, 2018
fce4c76
Merge branch 'master' into html-media
dclaux Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 30 additions & 16 deletions source/nodejs/adaptivecards-visualizer/css/liveTile.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

a.ac-anchor {
text-decoration: none;
}
Expand All @@ -30,18 +54,15 @@ a.ac-anchor:visited:active {
color: #004D84;
}

.ac-container.ac-selectable,
.ac-columnSet.ac-selectable {
padding: 0;
.ac-container.ac-selectable, .ac-columnSet.ac-selectable {
padding: 0px;
}

.ac-container.ac-selectable:hover,
.ac-columnSet.ac-selectable:hover {
.ac-container.ac-selectable:hover, .ac-columnSet.ac-selectable:hover {
background-color: rgba(0, 0, 0, 0.1) !important;
}

.ac-container.ac-selectable:active,
.ac-columnSet.ac-selectable:active {
.ac-container.ac-selectable:active, .ac-columnSet.ac-selectable:active {
background-color: rgba(0, 0, 0, 0.15) !important;
}

Expand Down Expand Up @@ -86,18 +107,11 @@ a.ac-anchor:visited:active {
height: 72px;
}

.ac-input.ac-textInput,
.ac-input.ac-numberInput,
.ac-input.ac-dateInput,
.ac-input.ac-timeInput {
.ac-input.ac-textInput, .ac-input.ac-numberInput, .ac-input.ac-dateInput, .ac-input.ac-timeInput {
height: 31px;
}

.ac-input.ac-textInput,
.ac-input.ac-numberInput,
.ac-input.ac-dateInput,
.ac-input.ac-timeInput,
.ac-input.ac-multichoiceInput {
.ac-input.ac-textInput, .ac-input.ac-numberInput, .ac-input.ac-dateInput, .ac-input.ac-timeInput, .ac-input.ac-multichoiceInput {
border: 1px solid #DDDDDD;
padding: 4px 8px 4px 8px;
}
33 changes: 25 additions & 8 deletions source/nodejs/adaptivecards-visualizer/css/outlook.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

@font-face {
font-family: 'FabricMDL2Icons';
src: url("https://appsforoffice.microsoft.com/fabric/fonts/icons/FabricMDL2Icons.woff") format("woff"), url("https://appsforoffice.microsoft.com/fabric/fonts/icons/FabricMDL2Icons.ttf") format("truetype");
Expand Down Expand Up @@ -105,15 +129,8 @@ a.ac-anchor:visited:active {
font-size: 10px;
font-style: normal;
font-weight: 900;
content: '\E70D';
}

.ac-pushButton.noIcon.expandable:after, .ac-pushButton.iconLeft.expandable:after {
margin: auto 0px auto 6px;
}

.ac-pushButton.iconAbove.expandable:after {
margin-top: 6px;
content: '\E70D';
}

.ac-pushButton.expandable.expanded:after {
Expand Down
24 changes: 24 additions & 0 deletions source/nodejs/adaptivecards-visualizer/css/skype.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

.skypeContainer {
display: -webkit-box;
display: -ms-flexbox;
Expand Down
44 changes: 29 additions & 15 deletions source/nodejs/adaptivecards-visualizer/css/teams.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

a.ac-anchor {
text-decoration: none;
}
Expand All @@ -30,18 +54,15 @@ a.ac-anchor:visited:active {
color: #004D84;
}

.ac-container.ac-selectable,
.ac-columnSet.ac-selectable {
.ac-container.ac-selectable, .ac-columnSet.ac-selectable {
padding: 0px;
}

.ac-container.ac-selectable:hover,
.ac-columnSet.ac-selectable:hover {
.ac-container.ac-selectable:hover, .ac-columnSet.ac-selectable:hover {
background-color: rgba(0, 0, 0, 0.1) !important;
}

.ac-container.ac-selectable:active,
.ac-columnSet.ac-selectable:active {
.ac-container.ac-selectable:active, .ac-columnSet.ac-selectable:active {
background-color: rgba(0, 0, 0, 0.15) !important;
}

Expand Down Expand Up @@ -93,18 +114,11 @@ a.ac-anchor:visited:active {
height: 72px;
}

.ac-input.ac-textInput,
.ac-input.ac-numberInput,
.ac-input.ac-dateInput,
.ac-input.ac-timeInput {
.ac-input.ac-textInput, .ac-input.ac-numberInput, .ac-input.ac-dateInput, .ac-input.ac-timeInput {
height: 31px;
}

.ac-input.ac-textInput,
.ac-input.ac-numberInput,
.ac-input.ac-dateInput,
.ac-input.ac-timeInput,
.ac-input.ac-multichoiceInput {
.ac-input.ac-textInput, .ac-input.ac-numberInput, .ac-input.ac-dateInput, .ac-input.ac-timeInput, .ac-input.ac-multichoiceInput {
border: 1px solid #DDDDDD;
padding: 4px 8px 4px 8px;
}
24 changes: 24 additions & 0 deletions source/nodejs/adaptivecards-visualizer/css/toast.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

a.ac-anchor {
text-decoration: none;
}
Expand Down
24 changes: 24 additions & 0 deletions source/nodejs/adaptivecards-visualizer/css/webchat.css
View file
Open in desktop
Expand Up @@ -10,6 +10,30 @@
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

a.ac-anchor {
text-decoration: none;
}
Expand Down
27 changes: 27 additions & 0 deletions source/nodejs/adaptivecards/scss/base.scss
View file
Open in desktop
Expand Up @@ -32,6 +32,33 @@ $font-family: 'Segoe UI', sans-serif;
background-color: rgba(0, 0, 0, 0.15);
}

.ac-media-poster {
}

.ac-media-poster.empty {
height: 200px;
background-color: #F2F2F2;
}

.ac-media-playButton {
width: 56px;
height: 56px;
border: 1px solid #EEEEEE;
border-radius: 28px;
box-shadow: 0px 0px 10px #EEEEEE;
background-color: rgba(255, 255, 255, 0.9);
color: black;
cursor: pointer;
}

.ac-media-playButton-arrow {
color: black;
}

.ac-media-playButton:hover {
background-color: white;
}

@mixin base-anchor(
$color: #005A9E,
$color-visited: #005A9E,
Expand Down