pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update audiovideo to scss. 

Rearrange elements.

Change out colors for variables.

Change out colors for variables.
pull/30/head
Evan Theurer 12 years ago
parent
adbca1c299
commit
63af6e4462
4 changed files with 316 additions and 336 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/styles/components/_audiolevel.scss
  2. 504
      src/styles/components/_audiovideo.scss
  3. 6
      src/styles/global/_mixins.scss
  4. 8
      src/styles/global/_variables.scss

8
src/styles/components/_audiolevel.scss
Unescape View File

@ -28,16 +28,16 @@
width: 400px; width: 400px;
z-index: 6; z-index: 6;
.audio-level { .audio-level {
background: #9dd53a; /* Old browsers */ background: $audiovideolevel; /* Old browsers */
background: gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */ background: gradient(linear, left top, left bottom, color-stop(0%,$audiovideolevel), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */
background: linear-gradient(to bottom, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */ background: linear-gradient(to bottom, $audiovideolevel 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
height: 4px; height: 4px;
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
right: 0; right: 0;
transition: width 0.05s ease-in-out; transition: width .05s ease-in-out;
width: 0; width: 0;
} }
} }

504
src/styles/components/_audiovideo.scss
Unescape View File

@ -18,308 +18,287 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#audiovideo { #audiovideo {
position:absolute; border-top: 1px solid $bordercolor;
left:0px; bottom: 0;
top:44px; left: 0;
bottom:0px; position: absolute;
right:0px; right: 0;
border-top:1px solid $bordercolor; top: 44px;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none; user-select: none;
} }
#audiovideo.fullscreen {
top:0px !important; #audiovideo {
right:0px !important; &.fullscreen {
bottom:0px !important; background: black !important;
left:0px !important; bottom: 0 !important;
background:black !important; left: 0 !important;
top: 0 !important;
right: 0 !important;
.remoteVideo .peerActions {
display: none;
}
}
@include breakpt-only-screen($breakpoint-video-small) {
right: 0;
}
} }
#audiovideo.fullscreen .remoteVideo .peerActions {
display:none; .mainScreenshare #audiovideo {
@include breakpt-only-screen($breakpoint-video-medium) {
display: none;
}
} }
.withChat #audiovideo, .withBuddylist #audiovideo {
right:260px; .withChat #audiovideo,
.withBuddylist #audiovideo {
right: 260px;
} }
.withBuddylist.withChat #audiovideo { .withBuddylist.withChat #audiovideo {
right:520px; right: 520px;
} }
.audiovideo { .audiovideo {
position:absolute; bottom: 0;
top:0px; left: 0;
left:0px; position: absolute;
bottom:0px; top: 0;
right:0px; right: 0;
} &.active {
.audiovideo.active {
perspective: 1000; perspective: 1000;
-webkit-perspective: 1000; &:hover .overlayActions {
} opacity: .3;
}
.audiovideo .audiovideoBase { .overlayActions:hover {
position:relative; opacity: .6;
width:100%; }
height:100%; .audiovideoBase {
transform: rotateY(180deg);
}
}
.audiovideoBase {
position: relative;
width: 100%;
height: 100%;
transition-property: transform; transition-property: transform;
-webkit-transition-property: -webkit-transform;
transition-duration: 2s; transition-duration: 2s;
-webkit-transition-duration: 2s;
transform: rotateY(0deg); transform: rotateY(0deg);
-webkit-transform: rotateY(0deg); z-index: 2;
z-index:2; }
} .localContainer {
bottom: 0;
.audiovideo.active .audiovideoBase { left: 0;
transform: rotateY(180deg); pointer-events: none;
-webkit-transform: rotateY(180deg);
}
.audiovideo .localContainer {
position: absolute; position: absolute;
left:0px; right: 0;
right:0px; top: 0;
top:0px;
bottom:0px;
transform: scale(-1, 1); transform: scale(-1, 1);
-webkit-transform: scale(-1, 1); z-index: 2;
pointer-events:none; }
z-index:2;
} }
.audiovideo .remoteContainer { .audiovideo {
.remoteContainer {
bottom: 0;
left: 0;
pointer-events: none;
position: absolute; position: absolute;
left:0px; right: 0;
right:0px; top: 0;
top:0px;
bottom:0px;
transform: rotateY(180deg); transform: rotateY(180deg);
-webkit-transform: rotateY(180deg); z-index: 2;
pointer-events:none; }
z-index:2; .miniContainer {
}
.audiovideo .miniContainer {
position: absolute;
max-height: 18%;
bottom: 2px; bottom: 2px;
max-height: 18%;
opacity: 0;
position: absolute;
right: 2px; right: 2px;
transform: scale(-1, 1); transform: scale(-1, 1);
-webkit-transform: scale(-1, 1);
opacity: 0;
transition-property: opacity; transition-property: opacity;
-webkit-transition-property: opacity; transition-duration: .5s;
transition-duration: 0.5s; &.visible {
-webkit-transition-duration: 0.5s;
}
.audiovideo .miniContainer.visible {
opacity: 1; opacity: 1;
} }
}
.audiovideo .miniVideo { .miniVideo {
display: block;
max-height: 100%; max-height: 100%;
max-width:100%; max-width: 100%;
display:block; }
} .localVideo {
background: $video-background;
.audiovideo .localVideo { display: block;
width: 100%;
max-height: 100%; max-height: 100%;
opacity: 0; opacity: 0;
transition-property: opacity; transition-property: opacity;
-webkit-transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
-webkit-transition-duration: 2s; width: 100%;
background: rgba(0,0,0,0.4); }
display:block;
} }
.audiovideo .remoteVideos { .audiovideo .remoteVideos {
position:absolute; bottom: 0;
left:0px; left: 0;
right:0px;
bottom:0px;
top:0px;
opacity: 0; opacity: 0;
position: absolute;
right: 0;
top: 0;
transition-property: opacity; transition-property: opacity;
-webkit-transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
-webkit-transition-duration: 2s;
video { video {
width:100%; display: block;
height:100%; height: 100%;
display:block; width: 100%;
} }
} }
.audiovideo { .audiovideo .remoteVideo{
background: $video-background;
.remoteVideo {
display: inline-block; display: inline-block;
width:100%; max-height: 100%;
max-width:100%; max-width: 100%;
max-height:100%; overflow: hidden;
vertical-align:bottom; position: relative;
position:relative; vertical-align: bottom;
visibility:hidden; visibility: hidden;
background: rgba(0,0,0,0.4); width: 100%;
overflow:hidden; &.withvideo {
} visibility: visible;
.remoteVideo.withvideo {
visibility:visible;
}
.remoteVideo.onlyaudio {
visibility:visible;
background: #666;
}
.remoteVideo .onlyaudio {
display:none;
position:absolute;
left:0px;
top:45%;
right:0px;
color:rgba(255,255,255,0.3);
text-align:center;
font-size:80px;
margin-top:-40px;
pointer-events:auto;
}
.remoteVideo.onlyaudio video {
display:none;
}
.remoteVideo.onlyaudio .onlyaudio {
display:block;
} }
.remoteVideo .peerActions { &.onlyaudio {
background: $video-onlyaudio-background;
visibility: visible;
}
.onlyaudio {
color: $video-onlyaudio;
display: none;
font-size: 80px;
left: 0;
margin-top: -40px;
pointer-events: auto;
position: absolute; position: absolute;
z-index: 10; right: 0;
left:0px; text-align: center;
right:0px; top: 45%;
bottom:5%; }
text-align:center; &.onlyaudio video {
opacity:.0; display: none;
}
&.onlyaudio .onlyaudio {
display: block;
}
.peerActions {
bottom: 5%;
left: 0;
opacity: 0;
pointer-events: auto;
position: absolute;
right: 0;
text-align: center;
transition-property: opacity; transition-property: opacity;
-webkit-transition-property: opacity; transition-duration: .2s;
transition-duration: 0.2s; z-index: 10;
-webkit-transition-duration: 0.2s; &:hover {
pointer-events:auto; opacity: .5;
} }
.remoteVideo .peerActions i { i {
font-size:3vw; font-size: 3vw;
} }
.remoteVideo .peerActions:hover {
opacity:.5;
} }
.remoteVideo .peerLabel { .peerLabel {
bottom: 4%;
color: white;
left: 4%;
font-size: 2.5vw;
max-width: 30%;
opacity: .7;
overflow: hidden;
padding: 4px;
position: absolute; position: absolute;
z-index:8; text-overflow: ellipsis;
left:4%; text-shadow: 0 0 4px black;
bottom:4%; white-space: nowrap;
font-size:2.5vw; z-index: 8;
color:white;
opacity:.7;
text-shadow: 0px 0px 4px black;
max-width:30%;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
padding:4px;
} }
} }
.audiovideo .overlayActions { .audiovideo .overlayActions {
position: absolute; background: $video-overlayactions;
left:0px; bottom: 0;
top:0px; height: 70px;
bottom:0px; left: 0;
height:70px;
margin:auto 0; margin:auto 0;
width:40px; opacity: 0;
padding:3px 0; padding: 3px 0;
background: rgba(0,0,0,0.9); position: absolute;
z-index:5; top: 0;
opacity:0; width: 40px;
z-index: 5;
button { button {
width:40px; color: #ccc;
cursor: pointer;
display: block; display: block;
color:#ccc;
cursor:pointer;
text-shadow: 0 0 5px black;
outline: 0; outline: 0;
text-shadow: 0 0 5px black;
width: 40px;
} }
} }
.audiovideo.active:hover .overlayActions { .remoteVideo {
opacity: 0.3; &.talking .peerLabel {
} color: $audiovideolevel;
}
.audiovideo.active .overlayActions:hover { .peerLabel {
opacity: 0.6;
}
.remoteVideo .peerLabel {
-webkit-transition: color 500ms ease-out;
-moz-transition: color 500ms ease-out;
-o-transition: color 500ms ease-out;
transition: color 500ms ease-out; transition: color 500ms ease-out;
} }
.overlayLogo {
.remoteVideo.talking .peerLabel { background: url(../img/logo-overlay.png) no-repeat center;
color: #9dd53a; background-size: 100%;
height: 20%;
.remoteVideo .overlayLogo { max-height: 40px;
position:absolute; max-width: 111px;
right:4%; opacity: .5;
top:4%;
width:20%;
height:20%;
max-height:40px;
max-width:111px;
background-image: url(../img/logo-overlay.png);
background-size:100%;
background-repeat:no-repeat;
background-position:center;
opacity:0.5;
z-index:2;
pointer-events: none; pointer-events: none;
position: absolute;
right: 4%;
top: 4%;
width: 20%;
z-index: 2;
}
} }
.miniContainer video { .miniContainer {
border:1px solid transparent; &.talking video {
border: 1px solid $audiovideolevel;
}
video {
border: 1px solid transparent;
}
} }
.miniContainer.talking video {
border:1px solid #9dd53a;
.renderer-smally { .renderer-smally {
width:150px; width: 150px;
.remoteVideos { .remoteVideos {
padding-bottom: 85px; padding-bottom: 85px;
} }
.miniContainer { .remoteVideo {
bottom:0px; .peerLabel {
left:0px; font-size: .9em;
right:0px; font-weight: bold;
max-height:none;
height:85px;
} }
.remoteVideo .peerLabel { .peerActions i {
font-size:.9em; font-size: 1em;
font-weight:bold;
} }
.remoteVideo .peerActions i {
font-size:1em;
} }
.overlayActions { .miniContainer {
display: none; bottom: 0;
height: 85px;
left: 0;
max-height: none;
right: 0;
} }
} }
@ -328,60 +307,47 @@
.renderer-conferencekiosk { .renderer-conferencekiosk {
.remoteVideos { .remoteVideos {
top:auto; background: $video-background;
bottom:2px; bottom: 2px;
text-align:center; min-height: 108px;
background:rgba(0,0,0,0.4); pointer-events: auto;
min-height:108px; text-align: center;
pointer-events:auto; top: auto;
white-space:nowrap; white-space: nowrap;
>div { > div {
height:108px; cursor: pointer;
width:192px; height: 108px;
cursor:pointer; width: 192px;
} }
.overlayLogo { .overlayLogo {
display:none; display: none;
} }
.peerLabel, .peerActions i { .peerLabel,
font-size:1.1em; .peerActions i {
font-size: 1.1em;
} }
.peerLabel { .peerLabel {
background: rgba(0,0,0,0.9); background: $video-overlayactions;
} }
} }
.miniContainer { .miniContainer {
height: 108px;
max-height: none; max-height: none;
height:108px; width: 192px;
width:192px;
} }
.bigVideo { .bigVideo {
position:absolute; bottom: 112px;
left:0px; left: 0;
right:0px;
bottom:112px;
top:2px;
margin: auto; margin: auto;
opacity: 0; opacity: 0;
position: absolute;
right: 0;
top: 2px;
transition-property: opacity; transition-property: opacity;
-webkit-transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
-webkit-transition-duration: 2s; video {
} width: 100%;
.bigVideo video { height: 100%;
width:100%;
height:100%;
}
}
@media only screen and (max-width: 630px) {
.mainScreenshare #audiovideo {
display:none;
} }
}
@media only screen and (max-width:590px) {
#audiovideo {
right:0px;
} }
} }

6
src/styles/global/_mixins.scss
Unescape View File

@ -4,3 +4,9 @@
@content; @content;
} }
} }
@mixin breakpt-only-screen($pt) {
@media only screen and (max-width: $pt) {
@content;
}
}

8
src/styles/global/_variables.scss
Unescape View File

@ -40,10 +40,18 @@ $grey4: rgba(0,0,0,.4);
$dgrey: rgb(34,34,34); $dgrey: rgb(34,34,34);
$red: rgb(219,79,57); $red: rgb(219,79,57);
$video-background: rgba(0,0,0,.4);
$video-onlyaudio-background: #666;
$video-onlyaudio: rgba(255,255,255,.3);
$video-overlayactions: rgba(0,0,0,.9);
$breakpoint-small: 480px; $breakpoint-small: 480px;
$breakpoint-medium: 700px; $breakpoint-medium: 700px;
$breakpoint-large: 1280px; $breakpoint-large: 1280px;
$breakpoint-video-small: 590px;
$breakpoint-video-medium: 630px;
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; $font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
// compass // compass

Write Preview
Loading…
Cancel
Save