Browse Source

Merge pull request #177 from theurere/fix-scss-lint-warnings

Fix scss lint warnings and errors.
pull/180/head
Simon Eisenmann 11 years ago
parent
commit
7c89b6fc37
  1. 30
      src/styles/_shame.scss
  2. 6
      src/styles/bootstrap.scss
  3. 2
      src/styles/components/_audiolevel.scss
  4. 177
      src/styles/components/_audiovideo.scss
  5. 100
      src/styles/components/_bar.scss
  6. 114
      src/styles/components/_buddylist.scss
  7. 56
      src/styles/components/_buddypicturecapture.scss
  8. 47
      src/styles/components/_buddypictureupload.scss
  9. 189
      src/styles/components/_chat.scss
  10. 33
      src/styles/components/_contactsmanager.scss
  11. 24
      src/styles/components/_fileinfo.scss
  12. 74
      src/styles/components/_presentation.scss
  13. 3
      src/styles/components/_screenshare.scss
  14. 16
      src/styles/components/_settings.scss
  15. 5
      src/styles/components/_social.scss
  16. 22
      src/styles/components/_usability.scss
  17. 50
      src/styles/components/_youtubevideo.scss
  18. 2
      src/styles/csp.scss
  19. 6
      src/styles/font-awesome.scss
  20. 11
      src/styles/global/_animations.scss
  21. 3
      src/styles/global/_base.scss
  22. 21
      src/styles/global/_loader.scss
  23. 7
      src/styles/global/_nicescroll.scss
  24. 29
      src/styles/global/_overlaybar.scss
  25. 44
      src/styles/global/_pages.scss
  26. 40
      src/styles/global/_variables.scss
  27. 6
      src/styles/global/_views.scss
  28. 60
      src/styles/main.scss
  29. 2
      static/css/bootstrap.min.css
  30. 2
      static/css/font-awesome.min.css

30
src/styles/_shame.scss

@ -30,31 +30,37 @@
#toast-container > .toast { #toast-container > .toast {
background-image: none !important; background-image: none !important;
} }
#toast-container > .toast:before { #toast-container > .toast:before {
position: fixed; color: #fff;
float: left;
font-family: FontAwesome; font-family: FontAwesome;
font-size: 20px; font-size: 20px;
line-height: 20px; line-height: 20px;
float: left; margin: auto .5em auto -1.5em;
color: #fff; padding-right: .5em;
padding-right: 0.5em; position: fixed;
margin: auto 0.5em auto -1.5em;
} }
#toast-container > .toast-warning:before { #toast-container > .toast-warning:before {
content: "\f05a"; content: '\f05a';
} }
#toast-container > .toast-error:before { #toast-container > .toast-error:before {
content: "\f05a"; content: '\f05a';
} }
#toast-container > .toast-info:before { #toast-container > .toast-info:before {
content: "\f05a"; content: '\f05a';
} }
#toast-container > .toast-success:before { #toast-container > .toast-success:before {
content: "\f05a"; content: '\f05a';
} }
// No shadows for toastr. // No shadows for toastr.
#toast-container > :hover, #toast-container > div { #toast-container > :hover,
#toast-container > div {
box-shadow: none !important; box-shadow: none !important;
} }
@ -65,12 +71,12 @@
// Update position of toastr close icon. // Update position of toastr close icon.
.toast-close-button { .toast-close-button {
top: -0.6em;
font-size: 1em; font-size: 1em;
top: -.6em;
} }
// No opacity for toastr. // No opacity for toastr.
#toast-container > div { #toast-container > div {
opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
opacity: 1;
} }

6
src/styles/bootstrap.scss vendored

@ -1,4 +1,4 @@
@import "compass"; @import 'compass';
@import "global/variables"; @import 'global/variables';
@import "libs/bootstrap/bootstrap"; @import 'libs/bootstrap/bootstrap';

2
src/styles/components/_audiolevel.scss

@ -27,7 +27,9 @@
top: $audiolevel-top; top: $audiolevel-top;
width: 400px; width: 400px;
z-index: 60; z-index: 60;
.audio-level { .audio-level {
// scss-lint:disable DuplicateProperty
background: $audiovideolevel; /* Old browsers */ background: $audiovideolevel; /* Old browsers */
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: 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, $audiovideolevel 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* W3C */ background: linear-gradient(to bottom, $audiovideolevel 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* W3C */

177
src/styles/components/_audiovideo.scss

@ -29,22 +29,25 @@
} }
#audiovideo { #audiovideo {
@include breakpt($breakpoint-video-small, max-width, only screen) {
right: 0;
}
&.fullscreen { &.fullscreen {
background: black !important; background: #000 !important;
bottom: 0 !important; bottom: 0 !important;
left: 0 !important; left: 0 !important;
top: 0 !important;
right: 0 !important; right: 0 !important;
top: 0 !important;
.remoteVideo .peerActions { .remoteVideo .peerActions {
display: none; display: none;
} }
} }
@include breakpt($breakpoint-video-small, max-width, only screen) {
right: 0;
}
} }
.mainScreenshare #audiovideo, .mainPresentation #audiovideo { .mainScreenshare #audiovideo,
.mainPresentation #audiovideo {
@include breakpt($breakpoint-video-medium, max-width, only screen) { @include breakpt($breakpoint-video-medium, max-width, only screen) {
display: none; display: none;
} }
@ -63,29 +66,35 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
position: absolute; position: absolute;
top: 0;
right: 0; right: 0;
top: 0;
&.active { &.active {
perspective: 1000; perspective: 1000;
&:hover .overlayActions { &:hover .overlayActions {
opacity: .3; opacity: .3;
} }
.overlayActions:hover { .overlayActions:hover {
opacity: .6; opacity: .6;
} }
.audiovideoBase { .audiovideoBase {
transform: rotateY(180deg); transform: rotateY(180deg);
} }
} }
.audiovideoBase { .audiovideoBase {
position: relative;
width: 100%;
height: 100%; height: 100%;
transition-property: transform; position: relative;
transition-duration: 2s;
transform: rotateY(0deg); transform: rotateY(0deg);
transition-duration: 2s;
transition-property: transform;
width: 100%;
z-index: 2; z-index: 2;
} }
.localContainer { .localContainer {
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -96,6 +105,7 @@
transform: scale(-1, 1); transform: scale(-1, 1);
z-index: 2; z-index: 2;
} }
video { video {
object-fit: cover; object-fit: cover;
} }
@ -112,36 +122,40 @@
transform: rotateY(180deg); transform: rotateY(180deg);
z-index: 2; z-index: 2;
} }
.miniContainer { .miniContainer {
background: #000;
bottom: 2px; bottom: 2px;
max-height: 18%;
height: 100%; height: 100%;
max-height: 18%;
opacity: 0; opacity: 0;
position: absolute; position: absolute;
right: 2px; right: 2px;
transform: scale(-1, 1); transform: scale(-1, 1);
transition-property: opacity;
transition-duration: .5s; transition-duration: .5s;
transition-property: opacity;
z-index: 25; z-index: 25;
background: black;
&.visible { &.visible {
opacity: 1; opacity: 1;
} }
} }
.miniVideo { .miniVideo {
display: block; display: block;
height: 100%;
max-height: 100%; max-height: 100%;
max-width: 100%; max-width: 100%;
height: 100%;
width: 100%; width: 100%;
} }
.localVideo { .localVideo {
background: $video-background; background: $video-background;
display: block; display: block;
max-height: 100%; max-height: 100%;
opacity: 0; opacity: 0;
transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
transition-property: opacity;
width: 100%; width: 100%;
} }
} }
@ -153,8 +167,9 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
transition-property: opacity;
video { video {
display: block; display: block;
height: 100%; height: 100%;
@ -172,13 +187,16 @@
vertical-align: bottom; vertical-align: bottom;
//visibility: hidden; //visibility: hidden;
width: 100%; width: 100%;
&.withvideo { &.withvideo {
//visibility: visible; //visibility: visible;
} }
&.onlyaudio { &.onlyaudio {
background: $video-onlyaudio-background; background: $video-onlyaudio-background;
//visibility: visible; //visibility: visible;
} }
.onlyaudio { .onlyaudio {
color: $video-onlyaudio; color: $video-onlyaudio;
display: none; display: none;
@ -191,15 +209,20 @@
text-align: center; text-align: center;
top: 45%; top: 45%;
} }
&.onlyaudio video, &.dummy video {
&.onlyaudio video,
&.dummy video {
visibility: hidden; visibility: hidden;
} }
&.onlyaudio .onlyaudio { &.onlyaudio .onlyaudio {
display: block; display: block;
} }
&.dummy .onlyaudio { &.dummy .onlyaudio {
display: block; display: block;
} }
.peerActions { .peerActions {
bottom: 5%; bottom: 5%;
left: 40px; left: 40px;
@ -208,28 +231,31 @@
position: absolute; position: absolute;
right: 40px; right: 40px;
text-align: center; text-align: center;
transition-property: opacity;
transition-duration: .2s; transition-duration: .2s;
transition-property: opacity;
z-index: 10; z-index: 10;
&:hover { &:hover {
opacity: .5; opacity: .5;
} }
i { i {
font-size: 3vw; font-size: 3vw;
} }
} }
.peerLabel { .peerLabel {
bottom: 4%; bottom: 4%;
color: white; color: #fff;
left: 4%;
font-size: 2.5vw; font-size: 2.5vw;
left: 4%;
max-width: 30%; max-width: 30%;
opacity: .7; opacity: .7;
overflow: hidden; overflow: hidden;
padding: 4px; padding: 4px;
position: absolute; position: absolute;
text-overflow: ellipsis; text-overflow: ellipsis;
text-shadow: 0 0 4px black; text-shadow: 0 0 4px #000;
white-space: nowrap; white-space: nowrap;
z-index: 8; z-index: 8;
} }
@ -247,31 +273,35 @@
top: 0; top: 0;
width: 40px; width: 40px;
z-index: 5; z-index: 5;
button { button {
color: #ccc; color: #ccc;
cursor: pointer; cursor: pointer;
display: block; display: block;
outline: 0; outline: 0;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
width: 40px; width: 40px;
} }
button.renderer-auditorium { button.renderer-auditorium {
position: relative; position: relative;
span:before { span:before {
position:absolute; content: '\f183';
left: 50%; left: 50%;
margin-left: -.8em;
margin-top: -.5em;
position: absolute;
top: 50%; top: 50%;
margin-left: -0.8em;
margin-top: -0.5em;
content: "\f183";
} }
span:after { span:after {
content: '\f183';
margin-right: -.9em;
margin-top: -.5em;
position: absolute; position: absolute;
top:50%;
right: 50%; right: 50%;
margin-right: -0.9em; top: 50%;
margin-top: -0.5em;
content: "\f183";
} }
} }
} }
@ -280,11 +310,13 @@
&.talking .peerLabel { &.talking .peerLabel {
color: $audiovideolevel; color: $audiovideolevel;
} }
.peerLabel { .peerLabel {
transition: color 500ms ease-out; transition: color 500ms ease-out;
} }
.overlayLogo { .overlayLogo {
background: url(../img/logo-overlay.png) no-repeat center; background: url('../img/logo-overlay.png') no-repeat center;
background-size: 100%; background-size: 100%;
height: 20%; height: 20%;
max-height: 40px; max-height: 40px;
@ -301,35 +333,40 @@
.miniContainer { .miniContainer {
&.talking:after { &.talking:after {
content: ""; bottom: 2px;
position: absolute; box-shadow: 0 0 20px $audiovideolevel inset;
top: 2px; content: '';
left: 2px; left: 2px;
position: absolute;
right: 2px; right: 2px;
bottom: 2px; top: 2px;
box-shadow: 0px 0px 20px $audiovideolevel inset;
} }
video { video {
} }
} }
.renderer-smally { .renderer-smally {
background: #000;
border-right: 0;
border-top: 0;
width: 150px; width: 150px;
background: black;
border-right: none;
border-top: none;
.remoteVideos { .remoteVideos {
padding-bottom: 85px; padding-bottom: 85px;
} }
.remoteVideo { .remoteVideo {
.peerLabel { .peerLabel {
font-size: .9em; font-size: .9em;
font-weight: bold; font-weight: bold;
} }
.peerActions i { .peerActions i {
font-size: 1em; font-size: 1em;
} }
} }
.miniContainer { .miniContainer {
bottom: 0; bottom: 0;
height: 85px; height: 85px;
@ -345,13 +382,13 @@
.renderer-democrazy { .renderer-democrazy {
.remoteVideos .miniContainer { .remoteVideos .miniContainer {
position: relative; bottom: auto;
display: inline-block;
max-height: 100%; max-height: 100%;
max-width: 100%; max-width: 100%;
display: inline-block; position: relative;
vertical-align: bottom;
bottom: auto;
right: auto; right: auto;
vertical-align: bottom;
} }
.active .miniContainer { .active .miniContainer {
@ -369,27 +406,33 @@
text-align: center; text-align: center;
top: auto; top: auto;
white-space: nowrap; white-space: nowrap;
> div { > div {
cursor: pointer; cursor: pointer;
height: 108px; height: 108px;
width: 192px; width: 192px;
} }
.overlayLogo { .overlayLogo {
display: none; display: none;
} }
.peerLabel, .peerLabel,
.peerActions i { .peerActions i {
font-size: 1.1em; font-size: 1.1em;
} }
.peerLabel { .peerLabel {
background: $video-overlayactions; background: $video-overlayactions;
} }
} }
.miniContainer { .miniContainer {
height: 108px; height: 108px;
max-height: none; max-height: none;
width: 192px; width: 192px;
} }
.bigVideo { .bigVideo {
bottom: 112px; bottom: 112px;
left: 0; left: 0;
@ -398,71 +441,83 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 2px; top: 2px;
transition-property: opacity;
transition-duration: 2s; transition-duration: 2s;
transition-property: opacity;
video { video {
width: 100%;
height: 100%; height: 100%;
width: 100%;
} }
} }
} }
.renderer-auditorium { .renderer-auditorium {
.remoteContainer { .remoteContainer {
border-left: 40px solid black; border-left: 40px solid #000;
} }
.remoteVideos { .remoteVideos {
background: $video-background;
pointer-events: auto;
top: 180px; top: 180px;
width: 320px; width: 320px;
pointer-events: auto;
background: $video-background;
.overlayLogo { .overlayLogo {
display: none; display: none;
} }
video { video {
height: 100%; height: 100%;
width: 100%;
object-fit: cover;
margin-top: -9px; margin-top: -9px;
object-fit: cover;
width: 100%;
} }
> div { > div {
cursor: pointer; cursor: pointer;
width: 80px;
height: 60px;
display: inline-block; display: inline-block;
height: 60px;
width: 80px;
} }
.overlayLogo { .overlayLogo {
display: none; display: none;
} }
.peerLabel { .peerLabel {
font-size: 0.6em;
background: $video-overlayactions; background: $video-overlayactions;
bottom: 0;
font-size: .6em;
left: 0;
line-height: 9px;
max-width: 100%; max-width: 100%;
bottom: 0px;
left: 0px;
right: 0px;
padding: 0 4px; padding: 0 4px;
line-height: 9px; right: 0;
} }
.peerActions { .peerActions {
display: none; display: none;
} }
.miniContainer { .miniContainer {
right: auto;
max-height: auto; max-height: auto;
right: auto;
} }
} }
.bigVideo { .bigVideo {
width: 320px;
height: 180px; height: 180px;
width: 320px;
video { video {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
.peerLabel { .peerLabel {
bottom: 8%;
font-size: 1vw; font-size: 1vw;
max-width: 40%; max-width: 40%;
bottom: 8%;
} }
} }
} }

100
src/styles/components/_bar.scss

@ -20,6 +20,7 @@
*/ */
.bar { .bar {
// scss-lint:disable PropertySpelling
background: $bar-background; background: $bar-background;
color: $componentfg1; color: $componentfg1;
font: bold 1em/50px $font-sans-serif; font: bold 1em/50px $font-sans-serif;
@ -31,50 +32,57 @@
.bar .left { .bar .left {
padding: 5px 5px 5px 15px; padding: 5px 5px 5px 15px;
@include breakpt($breakpoint-medium) {
padding: 2px 5px 0 11px;
padding: 2px 5px 0 11px;
}
.logo { .logo {
background: $logo no-repeat; background: $logo no-repeat;
background-size: 100%; background-size: 100%;
color: #000;
display: inline-block; display: inline-block;
color: black;
height: 32px;
width: 90px;
font: normal 11px/11px $font-sans-serif; font: normal 11px/11px $font-sans-serif;
height: 32px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
width: 90px;
@include breakpt($breakpoint-medium) {
background: $scalable-logo no-repeat center;
height: 46px;
width: 46px;
span {
display: none;
}
}
span { span {
font-style: italic; font-style: italic;
left: 38px; left: 38px;
position: relative; position: relative;
top: 26px; top: 26px;
} }
span a { span a {
color: $bar-logo-text-desc; color: $bar-logo-text-desc;
} }
@include breakpt($breakpoint-medium) {
background: $scalable-logo no-repeat center;
width: 46px;
height: 46px;
span {
display: none;
}
}
}
@include breakpt($breakpoint-medium) {
padding: 2px 5px 0px 11px;
} }
} }
.bar .middle { .bar .middle {
left: 0;
pointer-events: none;
position: absolute; position: absolute;
left: 0px;
right: 60px; right: 60px;
top: 0px;
pointer-events: none;
text-align: center; text-align: center;
top: 0;
> span { > span {
display: inline-block;
background: $bar-background; background: $bar-background;
display: inline-block;
min-height: 50px; min-height: 50px;
pointer-events: auto; pointer-events: auto;
} }
@ -82,9 +90,10 @@
.userpicture { .userpicture {
border-radius: 2px; border-radius: 2px;
display: inline-block; display: inline-block;
width: 46px;
height: 46px; height: 46px;
margin: -1px .5em 0 .5em; margin: -1px .5em 0;
width: 46px;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
display: none; display: none;
} }
@ -97,13 +106,15 @@
.status-reconnecting, .status-reconnecting,
.status-error, .status-error,
.status-ringing { .status-ringing {
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
max-width: 100%;
left: 0; left: 0;
max-width: 100%;
position: absolute; position: absolute;
right: 0; right: 0;
} }
} }
.status-connecting .actions, .status-connecting .actions,
.status-closed .actions, .status-closed .actions,
.status-reconnecting .actions, .status-reconnecting .actions,
@ -113,64 +124,75 @@
} }
.bar .right { .bar .right {
padding-right: 4px;
margin-top: -1px; margin-top: -1px;
padding-right: 4px;
.badge { .badge {
background-color: $actioncolor1; background-color: $actioncolor1;
border: 1px solid white; border: 1px solid #fff;
font-size: .4em; font-size: .4em;
position: absolute; position: absolute;
right: 0; right: 0;
top: 2px; top: 2px;
} }
.btn { .btn {
background: $bar-btn-action-normal; background: $bar-btn-action-normal;
border-color: $bar-btn-action-normal-border; border-color: $bar-btn-action-normal-border;
color: $bar-btn-action-color; color: $bar-btn-action-color;
height: 42px;
font: 24px/40px $font-sans-serif; font: 24px/40px $font-sans-serif;
height: 42px;
margin-left: -2px; margin-left: -2px;
padding: 0; padding: 0;
position: relative;
text-align: center; text-align: center;
width: 42px; width: 42px;
position: relative;
&:focus { &:focus {
border: none; border: 0;
outline: none;
box-shadow: 0; box-shadow: 0;
outline: none;
} }
&:hover { &:hover {
background-color: transparent; background-color: transparent;
border-color: $bar-btn-action-border; border-color: $bar-btn-action-border;
color: $bar-btn-action-hover; color: $bar-btn-action-hover;
} }
&.active { &.active {
background-color: transparent; background-color: transparent;
border-color: $bordercolor; border-color: $bordercolor;
color: $bar-btn-action-hover; color: $bar-btn-action-hover;
} }
&.active.amutebtn { &.active.amutebtn {
background-color: $bar-btn-action-mute; background-color: $bar-btn-action-mute;
border-color: $bar-btn-action-mute; border-color: $bar-btn-action-mute;
color: white; color: #fff;
} }
&.active.aenablebtn { &.active.aenablebtn {
background-color: $bar-btn-action-enable; background-color: $bar-btn-action-enable;
border-color: $bar-btn-action-enable; border-color: $bar-btn-action-enable;
color: white; color: #fff;
} }
} }
.btn-mutemicrophone i:before { .btn-mutemicrophone i:before {
content: "\f130"; content: '\f130';
} }
.btn-mutemicrophone.active i:before { .btn-mutemicrophone.active i:before {
content: "\f131"; content: '\f131';
} }
.btn-mutecamera i:before { .btn-mutecamera i:before {
content: "\f06e"; content: '\f06e';
} }
.btn-mutecamera.active i:before { .btn-mutecamera.active i:before {
content: "\f070"; content: '\f070';
} }
} }
@ -178,8 +200,8 @@
@keyframes shakeityeah { @keyframes shakeityeah {
0% { transform: translate(2px, 1px) rotate(0deg); } 0% { transform: translate(2px, 1px) rotate(0deg); }
2% { transform: translate(-1px, -2px) rotate(-1deg); } 2% { transform: translate(-1px, -2px) rotate(-1deg); }
4% { transform: translate(-3px, 0px) rotate(1deg); } 4% { transform: translate(-3px, 0) rotate(1deg); }
8% { transform: translate(0px, 2px) rotate(0deg); } 8% { transform: translate(0, 2px) rotate(0deg); }
10% { transform: translate(1px, -1px) rotate(1deg); } 10% { transform: translate(1px, -1px) rotate(1deg); }
12% { transform: translate(-1px, 2px) rotate(-1deg); } 12% { transform: translate(-1px, 2px) rotate(-1deg); }
14% { transform: translate(-3px, 1px) rotate(0deg); } 14% { transform: translate(-3px, 1px) rotate(0deg); }
@ -187,13 +209,13 @@
18% { transform: translate(-1px, -1px) rotate(1deg); } 18% { transform: translate(-1px, -1px) rotate(1deg); }
20% { transform: translate(2px, 2px) rotate(0deg); } 20% { transform: translate(2px, 2px) rotate(0deg); }
22% { transform: translate(1px, -2px) rotate(-1deg); } 22% { transform: translate(1px, -2px) rotate(-1deg); }
24% { transform: translate(0px, 0px) rotate(0deg); } 24% { transform: translate(0, 0) rotate(0deg); }
} }
.btn-shakeityeah { .btn-shakeityeah {
animation-name: shakeityeah; animation-duration: 4s;
animation-duration: 4.0s;
transform-origin:50% 50%;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-name: shakeityeah;
animation-timing-function: linear; animation-timing-function: linear;
transform-origin: 50% 50%;
} }

114
src/styles/components/_buddylist.scss

@ -30,14 +30,14 @@
#buddylist:before { #buddylist:before {
background: $buddylist-tab-background; background: $buddylist-tab-background;
border-bottom: 1px solid $bordercolor;
border-bottom-left-radius: 6px;
border-left: 1px solid $bordercolor; border-left: 1px solid $bordercolor;
border-top: 1px solid $bordercolor; border-top: 1px solid $bordercolor;
border-bottom: 1px solid $bordercolor;
border-top-left-radius: 6px; border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
bottom: 0; bottom: 0;
color: $buddylist-tab-color; color: $buddylist-tab-color;
content: "\f100"; content: '\f100';
cursor: pointer; cursor: pointer;
display: none; display: none;
font-family: FontAwesome; font-family: FontAwesome;
@ -46,18 +46,18 @@
left: 0; left: 0;
line-height: 55px; line-height: 55px;
margin: auto; margin: auto;
padding-right: 4px;
pointer-events: auto; pointer-events: auto;
position: absolute; position: absolute;
text-align: center; text-align: center;
top: 0; top: 0;
width: 26px; width: 26px;
z-index: 1; z-index: 1;
padding-right: 4px;
} }
.withBuddylist #buddylist:before { .withBuddylist #buddylist:before {
content: "\f101"; content: '\f101';
padding-right: 0px; padding-right: 0;
} }
.withBuddylistAutoHide #buddylist:before { .withBuddylistAutoHide #buddylist:before {
@ -84,16 +84,19 @@
display: block; display: block;
} }
} }
&.empty { &.empty {
.buddylistempty { .buddylistempty {
display: block; display: block;
} }
} }
.buddycontainer { .buddycontainer {
pointer-events: auto; pointer-events: auto;
position: relative; position: relative;
user-select: none; user-select: none;
} }
.buddylistempty { .buddylistempty {
bottom: 0; bottom: 0;
color: $font-color-accent; color: $font-color-accent;
@ -108,6 +111,7 @@
text-align: center; text-align: center;
top: 0; top: 0;
} }
.buddylistloading { .buddylistloading {
bottom: 0; bottom: 0;
color: $font-color-accent; color: $font-color-accent;
@ -123,6 +127,8 @@
} }
.buddy { .buddy {
@include tap-highlight-color($tap-highlight);
background: $sidepanebg; background: $sidepanebg;
border-bottom: 1px solid $bordercolor; border-bottom: 1px solid $bordercolor;
cursor: pointer; cursor: pointer;
@ -133,7 +139,6 @@
position: relative; position: relative;
text-align: left; text-align: left;
width: 100%; width: 100%;
@include tap-highlight-color($tap-highlight);
} }
.buddy:hover { .buddy:hover {
@ -141,24 +146,32 @@
} }
.buddy { .buddy {
&.withSubline .buddy1, &.contact .buddy1 { &.withSubline .buddy1,
&.contact .buddy1 {
top: 15px; top: 15px;
} }
&.withSubline .buddy2, &.contact .buddy2 {
&.withSubline .buddy2,
&.contact .buddy2 {
display: block; display: block;
} }
&.hovered .buddyactions { &.hovered .buddyactions {
right: 0; right: 0;
} }
& .fa.contact:before {
content: "\f006"; .fa.contact:before {
content: '\f006';
} }
&.contact .fa.contact:before { &.contact .fa.contact:before {
content: "\f005"; content: '\f005';
} }
&.isself .fa.contact:before { &.isself .fa.contact:before {
content: "\f192"; content: '\f192';
} }
.buddyPicture { .buddyPicture {
background: $actioncolor1; background: $actioncolor1;
border-radius: 2px; border-radius: 2px;
@ -169,65 +182,72 @@
position: relative; position: relative;
text-align: center; text-align: center;
width: 46px; width: 46px;
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
color: $actioncolor2; color: $actioncolor2;
line-height: 46px;
font-size: 3em; font-size: 3em;
line-height: 46px;
} }
img { img {
bottom: 0; bottom: 0;
display: block; display: block;
left: 0; left: 0;
max-height: 100%;
max-width: 100%;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
max-height: 100%;
max-width: 100%;
} }
} }
.buddyPictureSmall { .buddyPictureSmall {
margin:0px;
margin-left:0px;
height: 30px; height: 30px;
margin: 0;
margin-left: 0;
margin-right: 0;
width: 30px; width: 30px;
margin-right:0px;
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
line-height: 30px;
font-size: 2em; font-size: 2em;
line-height: 30px;
} }
} }
.buddy1 { .buddy1 {
color: $buddylist-buddy1; color: $buddylist-buddy1;
font-weight: bold;
font-size: 14px; font-size: 14px;
font-weight: bold;
height: 28px; height: 28px;
left: 65px; left: 65px;
position: absolute;
overflow: hidden; overflow: hidden;
position: absolute;
right: 4px; right: 4px;
text-overflow: ellipsis; text-overflow: ellipsis;
top: 24px; top: 24px;
white-space: nowrap; white-space: nowrap;
} }
.buddy2 { .buddy2 {
color: $buddylist-buddy2; color: $buddylist-buddy2;
display: none;
left: 65px; left: 65px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
right: 0px; right: 0;
top: 33px; top: 33px;
white-space: nowrap; white-space: nowrap;
display: none;
} }
.buddy3 { .buddy3 {
display: inline-block;
overflow: hidden; overflow: hidden;
white-space: nowrap; padding: 0 6px;
text-overflow: ellipsis;
text-align: left; text-align: left;
text-overflow: ellipsis;
vertical-align: middle; vertical-align: middle;
display: inline-block; white-space: nowrap;
width: 120px; width: 120px;
padding: 0px 6px;
} }
} }
@ -235,53 +255,59 @@
background: $buddylist-action-background; background: $buddylist-action-background;
height: 66px; height: 66px;
line-height: 66px; line-height: 66px;
padding: 0 10px;
position: absolute; position: absolute;
right: -125px; right: -125px;
padding: 0 10px;
text-align: right; text-align: right;
top: 0px; top: 0;
transition-property: right;
transition-duration: .3s; transition-duration: .3s;
transition-property: right;
white-space: nowrap; white-space: nowrap;
z-index: 5; z-index: 5;
.btn { .btn {
width: 42px; font-size: $buddylist-action-font-size;
height: 40px; height: 40px;
padding: 0px; line-height: 40px;
padding: 0;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
line-height: 40px; width: 42px;
font-size: $buddylist-action-font-size;
} }
} }
.buddy .buddysessions { .buddy .buddysessions {
margin-top: 56px;
max-height:0px;
margin-bottom: 10px; margin-bottom: 10px;
transition-property: max-height; margin-top: 56px;
transition-duration: .5s; max-height: 0;
transition-delay: .1s; transition-delay: .1s;
transition-duration: .5s;
transition-property: max-height;
ul { ul {
padding-top: 10px;
margin: 0 14px;
padding-left: 0px;
border-left: 1px dotted $bordercolor; border-left: 1px dotted $bordercolor;
border-right: 1px dotted $bordercolor; border-right: 1px dotted $bordercolor;
margin: 0 14px;
padding-left: 0;
padding-top: 10px;
} }
ul li { ul li {
margin-bottom: 2px;
margin-left: 0px;
list-style-type: none; list-style-type: none;
margin-bottom: 2px;
margin-left: 0;
.btn-group { .btn-group {
visibility: hidden; visibility: hidden;
} }
&:hover { &:hover {
.btn-group { .btn-group {
visibility: visible; visibility: visible;
} }
} }
} }
.currentsession .buddy3 { .currentsession .buddy3 {
font-weight: bold; font-weight: bold;
} }

56
src/styles/components/_buddypicturecapture.scss

@ -24,76 +24,92 @@
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
} }
.videoPicture { .videoPicture {
margin-bottom: 4px; margin-bottom: 4px;
.videoPictureVideo { .videoPictureVideo {
background-color: black; background-color: #000;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
video { video {
object-fit: cover; object-fit: cover;
} }
} }
.videoPictureVideo { .videoPictureVideo {
width: 200px;
height: 200px; height: 200px;
.videoPrev, video, .preview { width: 200px;
width: 100%;
.videoPrev,
video,
.preview {
height: 100%; height: 100%;
width: 100%;
} }
} }
.videoFlash { .videoFlash {
position: absolute; background-color: #fff;
left:0px;
right:0px;
top:0px;
bottom:0px;
background-color:white;
border: 1px dotted $bordercolor; border: 1px dotted $bordercolor;
bottom: 0;
left: 0;
position: absolute;
right: 0;
top: 0;
visibility: hidden; visibility: hidden;
z-index: 5; z-index: 5;
} }
.videoFlash.flash { .videoFlash.flash {
visibility: visible; visibility: visible;
} }
.preview { .preview {
left: 0; left: 0;
position: absolute; position: absolute;
top: 0; top: 0;
&.previewPicture { &.previewPicture {
position: relative; position: relative;
} }
} }
.showTakePicture { .showTakePicture {
.btn { .btn {
} }
} }
.btn-takePicture, .btn-takePicture,
.btn-retakePicture { .btn-retakePicture {
left: 0px; left: 0;
right: 0px;
position: absolute;
top: 50%;
margin: 0 auto; margin: 0 auto;
max-width: 40%; max-width: 40%;
position: absolute;
right: 0;
top: 50%;
} }
.btn-retakePicture { .btn-retakePicture {
visibility: hidden; visibility: hidden;
} }
.videoPictureVideo:hover .btn-retakePicture { .videoPictureVideo:hover .btn-retakePicture {
visibility: visible; visibility: visible;
} }
.countdownPicture { .countdownPicture {
color: $componentbg; color: $componentbg;
font-size: 45px; font-size: 45px;
left: 0px; left: 0;
right: 0px;
position: absolute;
top: 75px;
margin: 0 auto; margin: 0 auto;
opacity: .8;
position: absolute;
right: 0;
text-align: center; text-align: center;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
opacity:0.8; top: 75px;
} }
} }

47
src/styles/components/_buddypictureupload.scss

@ -21,79 +21,94 @@
.buddyPictureUpload { .buddyPictureUpload {
position: relative; position: relative;
.loader { .loader {
left: 90px;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
left: 90px;
.fa-spin { .fa-spin {
color: $componentfg4; color: $componentfg4;
} }
} }
>p { >p {
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
} }
.showUploadPicture { .showUploadPicture {
position: relative; background-color: $componentbg;
border: 1px solid $bordercolor; border: 1px solid $bordercolor;
height: 200px; height: 200px;
line-height: 200px; line-height: 200px;
margin-bottom: 10px; margin-bottom: 10px;
overflow: hidden; overflow: hidden;
position: relative;
text-align: center; text-align: center;
width: 200px;
background-color: $componentbg;
user-select: none; user-select: none;
width: 200px;
&.imgData { &.imgData {
background-color: black; background-color: #000;
.chooseUploadPicture { .chooseUploadPicture {
display: none; display: none;
} }
} }
.chooseUploadPicture { .chooseUploadPicture {
color: $componentfg4; color: $componentfg4;
left: 0;
margin: 0 auto;
position: absolute; position: absolute;
right: 0;
z-index: 1; z-index: 1;
left: 0px;
right: 0px;
margin: 0 auto;
} }
.fa { .fa {
color: $componentbg; color: $componentbg;
text-shadow: 0 0 5px black; opacity: .8;
opacity: 0.8; text-shadow: 0 0 5px #000;
} }
} }
.preview { .preview {
left: 0;
position: relative; position: relative;
top: 0px; top: 0;
left: 0px;
} }
.imageUtilites { .imageUtilites {
line-height: 30px; line-height: 30px;
position: absolute; position: absolute;
visibility: hidden; visibility: hidden;
width: 200px; width: 200px;
z-index: 1; z-index: 1;
.fa { .fa {
cursor: pointer; cursor: pointer;
font-size: 40px; font-size: 40px;
width: 50px;
height: 50px; height: 50px;
width: 50px;
} }
} }
.showUploadPicture.imgData:hover .imageUtilites { .showUploadPicture.imgData:hover .imageUtilites {
visibility: visible; visibility: visible;
} }
.moveHorizontal { .moveHorizontal {
top: -4px;
position: relative; position: relative;
top: -4px;
} }
.moveVertical { .moveVertical {
position: absolute;
left: 158px; left: 158px;
position: absolute;
} }
.resize { .resize {
position: relative; position: relative;
top: 108px; top: 108px;

189
src/styles/components/_chat.scss

@ -20,25 +20,27 @@
*/ */
#chat { #chat {
bottom: 0;
min-width: $chat-width;
opacity: 0;
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
bottom: 0px;
right: $chat-width; right: $chat-width;
top: 0px; top: 0;
width: $chat-width; width: $chat-width;
min-width: $chat-width;
z-index: 45; z-index: 45;
opacity: 0;
} }
.withChat { .withChat {
#chat { #chat {
opacity: 1; opacity: 1;
} }
&.withChatMaximized #chat { &.withChatMaximized #chat {
left: 0; left: 0;
width: auto; width: auto;
} }
.chat { .chat {
pointer-events: auto; pointer-events: auto;
} }
@ -46,18 +48,19 @@
.chatcontainer { .chatcontainer {
background: $chat-background; background: $chat-background;
bottom: 0px; bottom: 0;
left: 0px; left: 0;
right: 0px;
top: 0px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
right: 0;
top: 0;
} }
.showchatlist { .showchatlist {
.chatpane { .chatpane {
right: 100%; right: 100%;
} }
.chatlist { .chatlist {
left: 0; left: 0;
} }
@ -70,42 +73,50 @@
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
.list-group { .list-group {
margin-top: -1px;
margin-bottom: -1px; margin-bottom: -1px;
margin-top: -1px;
max-height: 100%; max-height: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
.list-group-item { .list-group-item {
border-right: none; border-left: 0;
border-left: none;
border-radius: 0; border-radius: 0;
border-right: 0;
line-height: 26px;
min-height: 51px;
padding-right: 70px; padding-right: 70px;
position: relative; position: relative;
min-height: 51px;
line-height: 26px;
&.newmessage { &.newmessage {
animation: newmessage 1s ease -0.3s infinite; animation: newmessage 1s ease -.3s infinite;
} }
&.disabled { &.disabled {
color: $chat-disabled; color: $chat-disabled;
} }
&:hover button { &:hover button {
display: inline; display: inline;
} }
.fa-lg { .fa-lg {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
width: 18px; width: 18px;
} }
.badge { .badge {
background: $chat-badge; background: $chat-badge;
border: 1px solid white; border: 1px solid #fff;
position: absolute; position: absolute;
right: 50px; right: 50px;
top: 14px; top: 14px;
} }
button { button {
display: none; display: none;
position: absolute; position: absolute;
@ -125,8 +136,8 @@
.chat { .chat {
background: $chat-background; background: $chat-background;
display: none;
bottom: 0; bottom: 0;
display: none;
left: 0; left: 0;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
@ -139,9 +150,11 @@
&.visible { &.visible {
display: block; display: block;
} }
.chatbody { .chatbody {
// nothing // nothing
} }
.chatheader { .chatheader {
// nothing // nothing
} }
@ -149,12 +162,13 @@
} }
.chatmenu { .chatmenu {
position: absolute;
top: 36px;
left: 0px;
right: 0px;
height: 36px; height: 36px;
left: 0;
padding: 2px 4px; padding: 2px 4px;
position: absolute;
right: 0;
top: 36px;
@include breakpt($breakpoint-chat-small, max-height) { @include breakpt($breakpoint-chat-small, max-height) {
display: none; display: none;
} }
@ -167,9 +181,11 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 74px; top: 74px;
@include breakpt($breakpoint-chat-small, max-height) { @include breakpt($breakpoint-chat-small, max-height) {
border-top: 1px solid $bordercolor; border-top: 1px solid $bordercolor;
top: 0px; top: 0;
top: 0;
} }
} }
@ -184,6 +200,11 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
@include breakpt($breakpoint-chat-small, max-height) {
display: none;
}
.chatstatusicon { .chatstatusicon {
cursor: pointer; cursor: pointer;
display: block; display: block;
@ -195,20 +216,24 @@
top: 0; top: 0;
width: 36px; width: 36px;
} }
.chatheadertitle { .chatheadertitle {
display: inline; display: inline;
padding-left: 28px; padding-left: 28px;
} }
.ctrl { .ctrl {
color: $chat-ctrl; color: $chat-ctrl;
position: absolute; position: absolute;
right: 1px; right: 1px;
top: 0; top: 0;
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
cursor: pointer; cursor: pointer;
padding: 6px; padding: 6px;
} }
} }
span { span {
display: inline-block; display: inline-block;
max-width: 60%; max-width: 60%;
@ -218,9 +243,6 @@
vertical-align: middle; vertical-align: middle;
white-space: nowrap; white-space: nowrap;
} }
@include breakpt($breakpoint-chat-small, max-height) {
display: none;
}
} }
.chat .outputbox { .chat .outputbox {
@ -229,6 +251,7 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
@include breakpt($breakpoint-chat-small, max-height) { @include breakpt($breakpoint-chat-small, max-height) {
bottom: 45px; bottom: 45px;
} }
@ -238,7 +261,8 @@
height: 100%; height: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
padding: 0.4em 0; padding: .4em 0;
> i { > i {
clear: both; clear: both;
color: $chat-meta; color: $chat-meta;
@ -246,6 +270,7 @@
font-size: .8em; font-size: .8em;
padding: 6px 0; padding: 6px 0;
text-align: center; text-align: center;
&.p2p { &.p2p {
font-weight: bold; font-weight: bold;
padding: 6px 0; padding: 6px 0;
@ -256,10 +281,12 @@
.chat.with_pictures .message { .chat.with_pictures .message {
&.is_self { &.is_self {
padding-right: 54px; padding-right: 54px;
.timestamp { .timestamp {
right: 58px; right: 58px;
} }
} }
&.is_remote { &.is_remote {
padding-left: 58px; padding-left: 58px;
} }
@ -269,23 +296,26 @@
background: $chat-msg-background; background: $chat-msg-background;
border: 1px solid $chat-msg-border; border: 1px solid $chat-msg-border;
border-radius: 6px; border-radius: 6px;
box-shadow: 0 0 2px 0 $chat-msg-shadow;
clear: both; clear: both;
display: block; display: block;
margin: 0 4px 2px 18px; margin: 0 4px 2px 18px;
padding: 8px; padding: 8px;
position: relative; position: relative;
word-wrap: break-word; word-wrap: break-word;
box-shadow: 0px 0px 2px 0px $chat-msg-shadow;
ul { ul {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
padding-left: 0; padding-left: 0;
} }
li { li {
line-height: 1.1em; line-height: 1.1em;
margin: 4px 0; margin: 4px 0;
padding-left: 1.2em; padding-left: 1.2em;
position: relative; position: relative;
&:before { &:before {
color: $chat-msg-default-icon-color; color: $chat-msg-default-icon-color;
content: '\f075'; content: '\f075';
@ -296,6 +326,7 @@
width: 12px; width: 12px;
} }
} }
.timestamp { .timestamp {
color: $chat-timestamp; color: $chat-timestamp;
font-size: .8em; font-size: .8em;
@ -304,18 +335,20 @@
text-align: right; text-align: right;
top: 8px; top: 8px;
} }
.timestamp-space { .timestamp-space {
width:40px;
height:10px;
float: right; float: right;
height: 10px;
width: 40px;
} }
strong { strong {
display: block; display: block;
padding-bottom: 2px;
margin-right: 40px; margin-right: 40px;
white-space: nowrap;
overflow: hidden; overflow: hidden;
padding-bottom: 2px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
} }
} }
@ -324,30 +357,36 @@
color: $chat-msg-default-icon-color; color: $chat-msg-default-icon-color;
transform: scale(-1, 1); transform: scale(-1, 1);
} }
li { li {
&.unread:before { &.unread:before {
content: $chat-msg-unread-icon;
color: $chat-msg-unread-icon-color; color: $chat-msg-unread-icon-color;
content: $chat-msg-unread-icon;
} }
&.sending:before { &.sending:before {
content: $chat-msg-sending-icon;
color: $chat-msg-sending-icon-color; color: $chat-msg-sending-icon-color;
content: $chat-msg-sending-icon;
} }
&.sent:before { &.sent:before {
content: $chat-msg-sent-icon;
color: $chat-msg-sent-icon-color; color: $chat-msg-sent-icon-color;
content: $chat-msg-sent-icon;
} }
&.delivered:before { &.delivered:before {
content: $chat-msg-delivered-icon;
color: $chat-msg-delivered-icon-color; color: $chat-msg-delivered-icon-color;
content: $chat-msg-delivered-icon;
} }
&.received:before { &.received:before {
content: $chat-msg-received-icon;
color: $chat-msg-received-icon-color; color: $chat-msg-received-icon-color;
content: $chat-msg-received-icon;
} }
&.read:before { &.read:before {
content: $chat-msg-read-icon;
color: $chat-msg-read-icon-color; color: $chat-msg-read-icon-color;
content: $chat-msg-read-icon;
} }
} }
} }
@ -357,6 +396,7 @@
left: auto; left: auto;
right: 4px; right: 4px;
} }
.buddyPicture { .buddyPicture {
background: $actioncolor1; background: $actioncolor1;
border-radius: 2px; border-radius: 2px;
@ -368,69 +408,79 @@
top: 4px; top: 4px;
width: 46px; width: 46px;
z-index: 0; z-index: 0;
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
color: $actioncolor2; color: $actioncolor2;
line-height: 46px; line-height: 46px;
} }
img { img {
display: block;
bottom: 0; bottom: 0;
display: block;
left: 0; left: 0;
right: 0;
position: absolute;
top: 0;
max-height: 100%; max-height: 100%;
max-width: 100%; max-width: 100%;
position: absolute;
right: 0;
top: 0;
} }
} }
} }
.chat .message { .chat .message {
// scss-lint:disable DuplicateProperty
&:before, &:before,
&:after { &:after {
border-style: solid; border-style: solid;
content: ""; content: '';
display: block; display: block;
position: absolute; position: absolute;
width: 0; width: 0;
} }
&.is_remote { &.is_remote {
background: $chat-msg-remote-background; background: $chat-msg-remote-background;
&:before { // arrow border &:before { // arrow border
border-width: 7px 11px 7px 0;
border-color: transparent $chat-arrow-border; border-color: transparent $chat-arrow-border;
border-width: 7px 11px 7px 0;
bottom: auto; bottom: auto;
left: -12px; left: -12px;
top: 4px; top: 4px;
} }
&:after { // arrow background &:after { // arrow background
border-width: 6px 10px 6px 0;
border-color: transparent $chat-msg-remote-background; border-color: transparent $chat-msg-remote-background;
border-width: 6px 10px 6px 0;
bottom: auto; bottom: auto;
left: -11px; left: -11px;
top: 5px; top: 5px;
} }
} }
&.is_self { &.is_self {
background: $chat-msg-self-background; background: $chat-msg-self-background;
margin-right:18px;
margin-left: 4px; margin-left: 4px;
margin-right: 18px;
padding-right: 0; padding-right: 0;
&:before { // arrow border &:before { // arrow border
border-width: 7px 0 7px 11px;
border-color: transparent $chat-arrow-border; border-color: transparent $chat-arrow-border;
border-width: 7px 0 7px 11px;
bottom: 4px;
bottom: auto; bottom: auto;
right: -12px; right: -12px;
bottom: 4px;
} }
&:after { // arrow background &:after { // arrow background
border-width: 6px 0 6px 10px;
border-color: transparent $chat-msg-self-background; border-color: transparent $chat-msg-self-background;
border-width: 6px 0 6px 10px;
bottom: 5px;
bottom: auto; bottom: auto;
right: -11px; right: -11px;
bottom: 5px;
} }
} }
&.with_name { &.with_name {
// none // none
} }
@ -444,54 +494,64 @@
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
right: 0; right: 0;
@include breakpt($breakpoint-chat-small, max-height) { @include breakpt($breakpoint-chat-small, max-height) {
height: auto; height: auto;
} }
} }
.typinghint { .typinghint {
padding: 0 6px 0 6px;
white-space: nowrap;
overflow: hidden;
font-size:.8em;
color: $chat-typing; color: $chat-typing;
font-size: .8em;
height: 14px; height: 14px;
overflow: hidden;
padding: 0 6px;
white-space: nowrap;
@include breakpt($breakpoint-chat-small, max-height) { @include breakpt($breakpoint-chat-small, max-height) {
display: none; display: none;
} }
} }
.inputbox { .inputbox {
position: relative; position: relative;
@include breakpt($breakpoint-chat-small, max-height) {
height: auto;
}
.btn { .btn {
display: none;
padding: .5em 1em;
position: absolute; position: absolute;
right: 6px; right: 6px;
top: 1px; top: 1px;
padding: .5em 1em;
display: none;
} }
> div { > div {
border-top: 1px solid $bordercolor; border-top: 1px solid $bordercolor;
} }
@include breakpt($breakpoint-chat-small, max-height) {
height: auto;
}
} }
.input { .input {
border-radius: 0;
border-color: transparent; border-color: transparent;
border-radius: 0;
box-shadow: none; box-shadow: none;
display: block; display: block;
height: 54px; height: 54px;
max-height: 54px; /* FF hack */
margin: 0; margin: 0;
max-height: 54px; /* FF hack */
resize: none; resize: none;
width: 100%; width: 100%;
@include breakpt($breakpoint-chat-small, max-height) {
max-height: 2.5em;
}
&:active, &:active,
&:focus { &:focus {
border-color: $chat-input-border-color; border-color: $chat-input-border-color;
} }
@include breakpt($breakpoint-chat-small, max-height) {
max-height: 2.5em;
}
} }
} }
@ -503,12 +563,13 @@
.chat.newmessage { .chat.newmessage {
.chatheadertitle:after { .chatheadertitle:after {
content: "***"; content: '***';
position: absolute; position: absolute;
right: 32px; right: 32px;
top: 2px; top: 2px;
} }
.chatheader { .chatheader {
animation: newmessage 1s ease -0.3s infinite; animation: newmessage 1s ease -.3s infinite;
} }
} }

33
src/styles/components/_contactsmanager.scss

@ -25,52 +25,64 @@
font-weight: normal; font-weight: normal;
text-align: baseline; text-align: baseline;
} }
.addbtn { .addbtn {
font-size: 14px; font-size: 14px;
.fa-users { .fa-users {
font-size: 22px; font-size: 22px;
} }
.fa-plus { .fa-plus {
font-size: 15px; font-size: 15px;
} }
} }
.editpicture { .editpicture {
vertical-align: middle;
float: left; float: left;
margin-right: 20px; margin-right: 20px;
vertical-align: middle;
} }
.uploadbtn { .uploadbtn {
margin-top: 7px; margin-top: 7px;
} }
.editlist { .editlist {
max-height: 250px; max-height: 250px;
overflow-y: auto; overflow-y: auto;
} }
.picture { .picture {
display: table-cell;
border-bottom: 0; border-bottom: 0;
cursor: auto; cursor: auto;
display: table-cell;
min-height: 46px; min-height: 46px;
position: static; position: static;
width: auto; width: auto;
.buddyPicture { .buddyPicture {
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
} }
.table { .table {
margin-bottom: 0px; margin-bottom: 0;
tr:first-child td { tr:first-child td {
border-top: none; border-top: 0;
} }
.name { .name {
width: 40%;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
width: 40%;
} }
.action { .action {
padding-right: 15px;
text-align: right; text-align: right;
vertical-align: middle; vertical-align: middle;
padding-right: 15px;
} }
} }
} }
@ -83,14 +95,15 @@
.search { .search {
&:before { &:before {
position: absolute; content: '\f002';
font-family: "fontAwesome"; font-family: 'fontAwesome';
content: "\f002";
font-size: 14px; font-size: 14px;
left: 22px;
opacity: .4; opacity: .4;
position: absolute;
top: 6px; top: 6px;
left: 22px;
} }
~ input { ~ input {
padding-left: 25px; padding-left: 25px;
} }

24
src/styles/components/_fileinfo.scss

@ -23,10 +23,10 @@
background: $fileinfo-background; background: $fileinfo-background;
border: 1px solid $fileinfo-border; border: 1px solid $fileinfo-border;
border-radius: 4px; border-radius: 4px;
max-width: 170px;
padding: 1em; padding: 1em;
position: relative; position: relative;
text-align: center; text-align: center;
max-width: 170px;
} }
.file-info { .file-info {
@ -34,19 +34,22 @@
position: relative; position: relative;
z-index: 3; z-index: 3;
} }
.file-info-bg { .file-info-bg {
bottom: 0; bottom: 0;
left: 41px; left: 41px;
right: 0;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
right: 0;
top: -17px; top: -17px;
z-index: 2; z-index: 2;
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
color: $fileinfo-icon-background-color; color: $fileinfo-icon-background-color;
font-size: 20em; font-size: 20em;
} }
} }
.actions { .actions {
left: 50%; left: 50%;
margin-left: 10px; margin-left: 10px;
@ -59,6 +62,7 @@
.is_remote .file-info { .is_remote .file-info {
background: $fileinfo-background-remote; background: $fileinfo-background-remote;
border: 1px solid $fileinfo-border-remote; border: 1px solid $fileinfo-border-remote;
.file-info-bg { .file-info-bg {
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
color: $fileinfo-icon-background-color-remote; color: $fileinfo-icon-background-color-remote;
@ -78,17 +82,19 @@
font-size: .8em; font-size: .8em;
height: 20px; height: 20px;
position: relative; position: relative;
> span { > span {
display: block; display: block;
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;
padding: 3px; padding: 3px;
position: absolute; position: absolute;
text-shadow: 1px 1px 1px white;
top: 0px;
right: 0; right: 0;
text-shadow: 1px 1px 1px #fff;
top: 0;
z-index: 5; z-index: 5;
} }
> div { > div {
bottom: 0; bottom: 0;
box-shadow: none !important; box-shadow: none !important;
@ -97,9 +103,11 @@
top: 0; top: 0;
width: 0; width: 0;
z-index: 0; z-index: 0;
&.progress-bar { &.progress-bar {
opacity: .5; opacity: .5;
} }
&.progress-bar.download { &.progress-bar.download {
opacity: 1; opacity: 1;
z-index: 1; z-index: 1;
@ -120,23 +128,28 @@
.file-info-speed { .file-info-speed {
bottom: 6px; bottom: 6px;
} }
.actions { .actions {
margin-left: 30px; margin-left: 30px;
opacity: 0; opacity: 0;
} }
.anim { .anim {
margin-left: 0; margin-left: 0;
} }
.hovercontrol { .hovercontrol {
&:hover .anim { &:hover .anim {
margin-left: -50px; margin-left: -50px;
} }
&:hover .actions { &:hover .actions {
margin-left: 0; margin-left: 0;
opacity: 1; opacity: 1;
} }
> div { > div {
transition: all .2s ease-in-out transition: all .2s ease-in-out;
} }
} }
} }
@ -145,6 +158,7 @@
.anim { .anim {
margin-left: -40px; margin-left: -40px;
} }
.file-info-size { .file-info-size {
margin-bottom: 10px; margin-bottom: 10px;
} }

74
src/styles/components/_presentation.scss

@ -44,11 +44,11 @@
} }
.presentationpane .welcome .progress .download-info { .presentationpane .welcome .progress .download-info {
position: absolute; color: $text-color;
left: 0; left: 0;
position: absolute;
text-shadow: 1px 1px 1px #fff;
width: 100%; width: 100%;
color: $text-color;
text-shadow: 1px 1px 1px white;
} }
.mainPresentation #presentation { .mainPresentation #presentation {
@ -66,29 +66,35 @@
.presentationpane { .presentationpane {
.canvasContainer { .canvasContainer {
width: 100%;
height: 100%; height: 100%;
width: 100%;
} }
canvas { canvas {
position: relative;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
position: relative;
} }
.odfcanvas { .odfcanvas {
user-select: none;
cursor: default; cursor: default;
user-select: none;
body { body {
background-color: transparent; background-color: transparent;
} }
document { document {
display: block; display: block;
} }
} }
.odfcontainer { .odfcontainer {
display: none; display: none;
padding: 0;
margin: 0; margin: 0;
padding: 0;
} }
.odfcontainer.showonepage { .odfcontainer.showonepage {
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
@ -107,11 +113,11 @@
} }
.presentation .overlaybar a.overlaybar-button { .presentation .overlaybar a.overlaybar-button {
position: absolute;
font-size: 20px; font-size: 20px;
padding: 4px 6px;
top: 0px;
line-height: 28px; line-height: 28px;
padding: 4px 6px;
position: absolute;
top: 0;
} }
.overlaybar-content .pagecontrol { .overlaybar-content .pagecontrol {
@ -123,8 +129,8 @@
} }
.presentation .overlaybar a.btn-next { .presentation .overlaybar a.btn-next {
right: 0px;
left: auto; left: auto;
right: 0;
} }
.pageinfo input { .pageinfo input {
@ -133,15 +139,15 @@
} }
.presentation .thumbnail { .presentation .thumbnail {
text-shadow: none;
color: #333; color: #333;
margin-top: 20px;
width: 160px;
height: 122px;
display: inline-block; display: inline-block;
height: 122px;
margin-left: 20px; margin-left: 20px;
margin-top: 20px;
position: relative; position: relative;
text-shadow: none;
vertical-align: middle; vertical-align: middle;
width: 160px;
} }
.presentation .thumbnail.presentable { .presentation .thumbnail.presentable {
@ -153,9 +159,9 @@
} }
.presentation .thumbnail .caption { .presentation .thumbnail .caption {
overflow: hidden;
padding-bottom: 0; padding-bottom: 0;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden;
} }
.presentation .thumbnail .caption .size { .presentation .thumbnail .caption .size {
@ -167,39 +173,39 @@
} }
.presentation .thumbnail .caption .download-info { .presentation .thumbnail .caption .download-info {
position: absolute; bottom: 0;
color: $text-color;
left: 0; left: 0;
line-height: 20px;
position: absolute;
right: 0; right: 0;
text-shadow: 1px 1px 1px #fff;
top: 0; top: 0;
bottom: 0;
line-height: 20px;
text-shadow: 1px 1px 1px white;
color: $text-color;
} }
.presentation .thumbnail .active { .presentation .thumbnail .active {
font-size: 10em; bottom: 0;
color: #84b819; color: #84b819;
opacity: 0.7; font-size: 10em;
position: absolute;
left: 0; left: 0;
opacity: .7;
position: absolute;
right: 0; right: 0;
top: 0;
bottom: 0;
text-align: center; text-align: center;
top: 0;
} }
.presentation .thumbnail .notavailable { .presentation .thumbnail .notavailable {
bottom: 0;
color: #d2322d;
display: none; display: none;
font-size: 10em; font-size: 10em;
color: #d2322d;
opacity: 0.25;
position: absolute;
left: 0; left: 0;
opacity: .25;
position: absolute;
right: 0; right: 0;
top: 0;
bottom: 0;
text-align: center; text-align: center;
top: 0;
} }
.presentation .thumbnail:hover .notavailable { .presentation .thumbnail:hover .notavailable {
@ -207,9 +213,9 @@
} }
.presentation .thumbnail .presentation-action { .presentation .thumbnail .presentation-action {
display: none;
position: absolute; position: absolute;
top: 1px; top: 1px;
display: none;
} }
.presentation .thumbnail .download { .presentation .thumbnail .download {
@ -230,9 +236,9 @@
.presentations { .presentations {
height: 156px; height: 156px;
margin-left: -25px;
margin-right: 10px;
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap; white-space: nowrap;
margin-right: 10px;
margin-left: -25px;
} }

3
src/styles/components/_screenshare.scss

@ -32,7 +32,7 @@
} }
.screensharepane { .screensharepane {
background: black; background: #000;
bottom: 0; bottom: 0;
left: 0; left: 0;
overflow: auto; overflow: auto;
@ -45,6 +45,7 @@
.remotescreen { .remotescreen {
position: relative; position: relative;
} }
video { video {
max-height: 99%; max-height: 99%;
width: 100%; width: 100%;

16
src/styles/components/_settings.scss

@ -20,8 +20,8 @@
*/ */
#settings { #settings {
border-left: 1px solid $bordercolor;
background: $settings-background; background: $settings-background;
border-left: 1px solid $bordercolor;
bottom: 0; bottom: 0;
padding-right: 20px; padding-right: 20px;
position: fixed; position: fixed;
@ -34,12 +34,15 @@
#settings.show { #settings.show {
right: 0; right: 0;
@include breakpt($breakpoint-settings-medium, max-width, only screen) { @include breakpt($breakpoint-settings-medium, max-width, only screen) {
background: $settings-background; background: $settings-background;
left: 0; left: 0;
width: auto; width: auto;
} }
.form-actions { .form-actions {
@include breakpt($breakpoint-settings-medium, max-width, only screen) { @include breakpt($breakpoint-settings-medium, max-width, only screen) {
bottom: 0; bottom: 0;
height: 60px; height: 60px;
@ -65,6 +68,10 @@
} }
.settings { .settings {
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
padding-bottom: 10px;
}
.version { .version {
color: $settings-version; color: $settings-version;
font-size: 10px; font-size: 10px;
@ -72,12 +79,14 @@
right: 10px; right: 10px;
top: 10px; top: 10px;
} }
.form-horizontal { .form-horizontal {
.controls { .controls {
@include breakpt($breakpoint-settings-medium, max-width, only screen) { @include breakpt($breakpoint-settings-medium, max-width, only screen) {
margin-left: 110px; margin-left: 110px;
} }
} }
.control-label { .control-label {
@include breakpt($breakpoint-settings-medium, max-width, only screen) { @include breakpt($breakpoint-settings-medium, max-width, only screen) {
width: 100px; width: 100px;
@ -85,12 +94,9 @@
} }
} }
} }
@include breakpt($breakpoint-settings-medium, max-width, only screen) {
padding-bottom: 10px;
}
} }
settings-advanced { settings-advanced {
padding-top: 15px;
display: block; display: block;
padding-top: 15px;
} }

5
src/styles/components/_social.scss

@ -23,18 +23,23 @@
&.link { &.link {
color: $social-email-color; color: $social-email-color;
} }
&.email { &.email {
color: $social-email-color; color: $social-email-color;
} }
&.facebook { &.facebook {
color: $social-facebook-color; color: $social-facebook-color;
} }
&.google { &.google {
color: $social-google-color; color: $social-google-color;
} }
&.twitter { &.twitter {
color: $social-twitter-color; color: $social-twitter-color;
} }
&.xing { &.xing {
color: $social-xing-color; color: $social-xing-color;
} }

22
src/styles/components/_usability.scss

@ -27,9 +27,9 @@
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
right: 0; right: 0;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
transition: right 200ms ease-in-out;
top: 80px; top: 80px;
transition: right 200ms ease-in-out;
user-select: none; user-select: none;
width: 350px; width: 350px;
} }
@ -45,20 +45,24 @@
} }
#help { #help {
> div {
margin: 0 10px;
}
.help-subline {
color: #888;
padding: 20px 0;
}
@include breakpt($breakpoint-useability-small, max-width, only screen) { @include breakpt($breakpoint-useability-small, max-width, only screen) {
display: none; display: none;
} }
@include breakpt($breakpoint-useability-small, min-width, only screen, $breakpoint-useability-large) { @include breakpt($breakpoint-useability-small, min-width, only screen, $breakpoint-useability-large) {
font-size: 1em; font-size: 1em;
width: 250px; width: 250px;
} }
> div {
margin: 0 10px;
}
.help-subline {
color: #888;
padding: 20px 0;
}
.btn { .btn {
text-shadow: none; text-shadow: none;
} }

50
src/styles/components/_youtubevideo.scss

@ -20,10 +20,10 @@
*/ */
.youtubevideo { .youtubevideo {
position: absolute; bottom: 0;
left: 0; left: 0;
position: absolute;
right: 0; right: 0;
bottom: 0;
top: 0; top: 0;
} }
@ -41,16 +41,17 @@
} }
#youtubeplayerinfo { #youtubeplayerinfo {
position: absolute;
left: 0;
right: 0;
bottom: 10%; bottom: 10%;
left: 0;
opacity: 0; opacity: 0;
pointer-events: auto; pointer-events: auto;
position: absolute;
right: 0;
text-align: center; text-align: center;
transition-property: opacity;
transition-duration: .2s; transition-duration: .2s;
transition-property: opacity;
z-index: 10; z-index: 10;
&:hover { &:hover {
opacity: .8; opacity: .8;
} }
@ -59,17 +60,17 @@
#youtubeplayerinfo div { #youtubeplayerinfo div {
background-color: #f9f2f4; background-color: #f9f2f4;
border-radius: 10px; border-radius: 10px;
padding: 20px 40px;
display: inline-block; display: inline-block;
font-size: 2em; font-size: 2em;
padding: 20px 40px;
} }
.youtubevideo .click-container { .youtubevideo .click-container {
position: absolute;
left: 0;
top: 0;
bottom: 0; bottom: 0;
left: 0;
position: absolute;
right: 0; right: 0;
top: 0;
z-index: 5; z-index: 5;
} }
@ -86,8 +87,8 @@
} }
.youtubevideo .welcome .welcome-logo { .youtubevideo .welcome .welcome-logo {
font-size: 10em;
background: transparent; background: transparent;
font-size: 10em;
} }
.mainYoutubevideo #youtubevideo { .mainYoutubevideo #youtubevideo {
@ -101,14 +102,14 @@
} }
.youtubevideo .overlaybar-content { .youtubevideo .overlaybar-content {
width: 100%;
max-width: 100%; max-width: 100%;
width: 100%;
} }
.youtubevideo .overlaybar-input { .youtubevideo .overlaybar-input {
padding-right: 15px;
position: relative; position: relative;
width: 100%; width: 100%;
padding-right: 15px;
} }
.youtubevideo .overlaybar-content form .overlaybar-buttons { .youtubevideo .overlaybar-content form .overlaybar-buttons {
@ -118,15 +119,16 @@
} }
.volumecontrol { .volumecontrol {
position: absolute; background: rgba(0, 0, 0, .6);
left: 0;
right: 0;
bottom: 0; bottom: 0;
left: 0;
opacity: 0; opacity: 0;
padding: 4px;
pointer-events: auto; pointer-events: auto;
position: absolute;
right: 0;
z-index: 10; z-index: 10;
background: rgba(0, 0, 0, 0.6);
padding: 4px;
&:hover { &:hover {
opacity: 1; opacity: 1;
} }
@ -139,36 +141,36 @@
.volumebar { .volumebar {
display: inline-block; display: inline-block;
vertical-align: middle;
padding: 6px 8px; padding: 6px 8px;
vertical-align: middle;
} }
.volumebar input[type="range"] { .volumebar input[type="range"] {
-webkit-appearance: none; -webkit-appearance: none;
background-color: #aaa; background-color: #aaa;
border: 1px solid #aaa; border: 1px solid #aaa;
width: 100px;
height: 3px; height: 3px;
outline: 0; outline: 0;
width: 100px;
} }
.volumebar input[type="range"]::-webkit-slider-thumb { .volumebar input[type="range"]::-webkit-slider-thumb {
-webkit-appearance: none; -webkit-appearance: none;
background-color: #fff; background-color: #fff;
width: 6px;
height: 20px; height: 20px;
width: 6px;
} }
.volumebar input[type="range"]::-moz-range-track { .volumebar input[type="range"]::-moz-range-track {
background: #aaa; background: #aaa;
border: none; border: 0;
} }
.volumebar input[type="range"]::-moz-range-thumb { .volumebar input[type="range"]::-moz-range-thumb {
background-color: #fff; background-color: #fff;
width: 6px;
height: 20px;
border-radius: 0; border-radius: 0;
height: 20px;
width: 6px;
} }
.volumebar input[type="range"]::-moz-focusring { .volumebar input[type="range"]::-moz-focusring {

2
src/styles/csp.scss

@ -19,4 +19,4 @@
* *
*/ */
@import "libs/angular/angular-csp.scss"; @import 'libs/angular/angular-csp';

6
src/styles/font-awesome.scss vendored

@ -1,4 +1,4 @@
@import "compass"; @import 'compass';
@import "global/variables"; @import 'global/variables';
@import "libs/font-awesome/scss/font-awesome"; @import 'libs/font-awesome/scss/font-awesome';

11
src/styles/global/_animations.scss

@ -26,17 +26,20 @@
.animate-show { .animate-show {
&.ng-hide-add { &.ng-hide-add {
opacity: 1;
display: block !important; display: block !important;
transition: all linear 0.5s; opacity: 1;
transition: all linear .5s;
&.ng-hide-add-active { &.ng-hide-add-active {
opacity: 0; opacity: 0;
} }
} }
&.ng-hide-remove { &.ng-hide-remove {
opacity: 0;
display: block !important; display: block !important;
transition: all linear 0.5s; opacity: 0;
transition: all linear .5s;
&.ng-hide-remove-active { &.ng-hide-remove-active {
opacity: 1; opacity: 1;
} }

3
src/styles/global/_base.scss

@ -46,6 +46,7 @@ a {
right: 0; right: 0;
top: 0; top: 0;
z-index: 0; z-index: 0;
@include hidpi { @include hidpi {
background-image: $main-background-retina; background-image: $main-background-retina;
background-size: image-width($main-background-image-retina)/2 image-height($main-background-image-retina)/2; background-size: image-width($main-background-image-retina)/2 image-height($main-background-image-retina)/2;
@ -62,5 +63,5 @@ a {
} }
.desktopnotify-icon { .desktopnotify-icon {
background-image: url("../img/logo-48x48.png"); background-image: url('../img/logo-48x48.png');
} }

21
src/styles/global/_loader.scss

@ -24,34 +24,37 @@
background-size: contain; background-size: contain;
bottom: 15%; bottom: 15%;
left: 15%; left: 15%;
max-width: 200px;
max-height: 150px;
margin: auto; margin: auto;
max-height: 150px;
max-width: 200px;
opacity: 1; opacity: 1;
pointer-events: none; pointer-events: none;
position: fixed; position: fixed;
right: 15%; right: 15%;
top: 15%; top: 15%;
z-index: 20000;
transition-property: opacity;
transition-duration: .5s; transition-duration: .5s;
transition-property: opacity;
z-index: 20000;
&.done { &.done {
opacity: 0; opacity: 0;
} }
> div { > div {
bottom: 0;
color: $loading; color: $loading;
display: block; display: block;
font-size: 2em; font-size: 2em;
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;
right: 0;
position: absolute;
bottom: 0px;
margin-bottom: -40px; margin-bottom: -40px;
position: absolute;
right: 0;
text-align: center; text-align: center;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
} }
.loader-message { .loader-message {
font-size: 0.5em; font-size: .5em;
} }
} }

7
src/styles/global/_nicescroll.scss

@ -25,16 +25,19 @@
border: solid transparent; border: solid transparent;
height: 8px; height: 8px;
width: 8px; width: 8px;
&:hover { &:hover {
background-color: $background; background-color: $background;
border-left: 1px solid rgba(0, 0, 0, .12); border-left: 1px solid rgba(0, 0, 0, .12);
border-right: 1px solid rgba(0, 0, 0, .12); border-right: 1px solid rgba(0, 0, 0, .12);
} }
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background: rgba(0,0,0,0.2); background: rgba(0, 0, 0, .2);
&:active { &:active {
background: rgba(0,0,0,0.4); background: rgba(0, 0, 0, .4);
} }
} }
} }

29
src/styles/global/_overlaybar.scss

@ -21,35 +21,40 @@
.overlaybar { .overlaybar {
background: $overlaybar-background; background: $overlaybar-background;
border-bottom: 1px solid #222;
border-top: 1px solid #222;
color: $overlaybar-color; color: $overlaybar-color;
min-height: 36px; min-height: 36px;
padding: 3px 8px 0 30px; padding: 3px 8px 0 30px;
position: absolute; position: absolute;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
user-select: none; user-select: none;
vertical-align: middle; vertical-align: middle;
border-bottom: 1px solid #222;
border-top: 1px solid #222;
} }
.overlaybar { .overlaybar {
&:hover { &:hover {
background: $componentfg2; background: $componentfg2;
} }
.btn { .btn {
text-shadow: none; text-shadow: none;
} }
.btn-link { .btn-link {
text-shadow: 0 0 5px black; text-shadow: 0 0 5px #000;
} }
.form-group > * { .form-group > * {
float: left; float: left;
padding-top: 0; padding-top: 0;
} }
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin-top: 2px; margin-top: 2px;
} }
label { label {
padding-top: 6px !important; padding-top: 6px !important;
} }
@ -58,44 +63,52 @@
.overlaybar { .overlaybar {
&.notvisible { &.notvisible {
background: transparent; background: transparent;
pointer-events: none;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
border-top: 1px solid transparent; border-top: 1px solid transparent;
pointer-events: none;
&:hover { &:hover {
background: transparent; background: transparent;
} }
.overlaybar-content { .overlaybar-content {
display: none; display: none;
} }
.overlaybar-overlay { .overlaybar-overlay {
display: block; display: block;
} }
} }
.overlaybar-button { .overlaybar-button {
color: $overlaybar-btn; color: $overlaybar-btn;
display: block; display: block;
font-size: 20px; font-size: 20px;
top: 0px;
left: 3px; left: 3px;
opacity: .7; opacity: .7;
padding: 4px 6px; padding: 4px 6px;
position: absolute;
pointer-events: auto; pointer-events: auto;
position: absolute;
top: 0;
vertical-align: middle; vertical-align: middle;
z-index: 15; z-index: 15;
} }
.overlaybar-content { .overlaybar-content {
display: inline-block; display: inline-block;
margin-left: .5em;
margin-bottom: 0; margin-bottom: 0;
margin-left: .5em;
max-width: 60%; max-width: 60%;
> * { > * {
padding-right: .5em; padding-right: .5em;
} }
.input-group { .input-group {
max-width: 160px; max-width: 160px;
} }
} }
.overlaybar-overlay { .overlaybar-overlay {
display: none; display: none;
margin-left: .5em; margin-left: .5em;

44
src/styles/global/_pages.scss

@ -28,25 +28,26 @@
} }
.welcome { .welcome {
color: $welcome; color: $welcome;
font-size: 1.1em; font-size: 1.1em;
margin-top: 80px; margin-top: 80px;
text-shadow: 0 0 5px black;
max-width: 600px; max-width: 600px;
min-height: 160px; min-height: 160px;
padding-left: 105px; padding-left: 105px;
padding-right: 0px; padding-right: 0;
position: relative; position: relative;
text-shadow: 0 0 5px #000;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
margin: 0 auto;
padding-left: 10px; padding-left: 10px;
padding-right: 20px; padding-right: 20px;
margin: 0 auto;
} }
h1 { h1 {
margin-top: 0px; margin-top: 0;
white-space: nowrap; white-space: nowrap;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
white-space: normal; white-space: normal;
} }
@ -57,46 +58,50 @@
} }
.welcome-logo { .welcome-logo {
background: $scalable-logo no-repeat left top;
background-size: contain;
bottom: 0;
left: 0;
position: absolute; position: absolute;
left: 0px;
top: 1px; top: 1px;
bottom: 0px;
width: 90px; width: 90px;
background: $scalable-logo no-repeat left top;
background-size: contain;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
position: relative;
height: 70px; height: 70px;
width: 70px;
margin-top: 30px;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 30px;
position: relative;
width: 70px;
} }
} }
.welcome-input { .welcome-input {
position: relative; position: relative;
input { input {
padding-right: 105px; padding-right: 105px;
} }
} }
.welcome-input-buttons { .welcome-input-buttons {
text-shadow: none;
position: absolute; position: absolute;
top: 6px;
right: 8px; right: 8px;
text-shadow: none;
top: 6px;
a { a {
color: #000;
padding-right: .5em; padding-right: .5em;
color: black;
user-select: none; user-select: none;
} }
} }
.room-link { .room-link {
margin-top: -10px; margin-top: -10px;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
a { a {
color: $welcome; color: $welcome;
} }
@ -104,12 +109,15 @@
.rooms-history { .rooms-history {
margin-top: 3em; margin-top: 3em;
a { a {
display: inline-block;
margin-right: .5em;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
} }
margin-right: .5em;
display: inline-block;
} }
} }

40
src/styles/global/_variables.scss

@ -19,7 +19,7 @@
* *
*/ */
@import "compass/utilities/color/contrast"; @import 'compass/utilities/color/contrast';
// general // general
$background: #e5e5e5 !default; $background: #e5e5e5 !default;
@ -28,19 +28,19 @@ $componentfg1: #262626 !default;
$componentfg2: rgba(0, 0, 0, .5) !default; $componentfg2: rgba(0, 0, 0, .5) !default;
$componentfg3: rgba(0, 0, 0, .2) !default; $componentfg3: rgba(0, 0, 0, .2) !default;
$componentfg4: #737373 !default; $componentfg4: #737373 !default;
$sidepanebg: white !default; $sidepanebg: #fff !default;
$bordercolor: #e7e7e7 !default; $bordercolor: #e7e7e7 !default;
$actioncolor1: rgb(132, 184, 25) !default; $actioncolor1: rgb(132, 184, 25) !default;
$actioncolor2: rgb(0, 149, 52) !default; $actioncolor2: rgb(0, 149, 52) !default;
// branding // branding
$logo: url("../img/logo-small.png") !default; $logo: url('../img/logo-small.png') !default;
$scalable-logo: url("../img/logo.svg") !default; $scalable-logo: url('../img/logo.svg') !default;
$load-logo: $scalable-logo !default; $load-logo: $scalable-logo !default;
// background // background
$main-background-image: "../img/bg-tiles.jpg" !default; $main-background-image: '../img/bg-tiles.jpg' !default;
$main-background-image-retina: "../img/bg-tiles_x2.jpg" !default; $main-background-image-retina: '../img/bg-tiles_x2.jpg' !default;
$main-background: url($main-background-image) !default; $main-background: url($main-background-image) !default;
$main-background-retina: url($main-background-image-retina) !default; $main-background-retina: url($main-background-image-retina) !default;
@ -57,7 +57,7 @@ $loading: #ddd !default;
$pane-width: 260px !default; $pane-width: 260px !default;
// font // font
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif !default; $font-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif !default;
$base-font-size: 13px; // compass vertical_rhythm mixin $base-font-size: 13px; // compass vertical_rhythm mixin
$base-line-height: 20px; // compass vertical_rhythm mixin $base-line-height: 20px; // compass vertical_rhythm mixin
$font-color: lighten(#000, 20%) !default; $font-color: lighten(#000, 20%) !default;
@ -93,14 +93,14 @@ $video-onlyaudio: rgba(255,255,255,.3) !default;
$video-overlayactions: rgba(0, 0, 0, .9) !default; $video-overlayactions: rgba(0, 0, 0, .9) !default;
// settings // settings
$settings-background: white !default; $settings-background: #fff !default;
// buddylist // buddylist
$buddylist-width: $pane-width !default; $buddylist-width: $pane-width !default;
$buddylist-background: $componentbg !default; $buddylist-background: $componentbg !default;
$buddylist-tab-color: rgba(0, 0, 0, .3) !default; $buddylist-tab-color: rgba(0, 0, 0, .3) !default;
$buddylist-tab-background: $componentbg !default; $buddylist-tab-background: $componentbg !default;
$buddylist-action-background: rgba(255,255,255,0.5) !default; $buddylist-action-background: rgba(255, 255, 255, .5) !default;
$buddylist-buddy1: $componentfg1 !default; $buddylist-buddy1: $componentfg1 !default;
$buddylist-buddy2: $componentfg2 !default; $buddylist-buddy2: $componentfg2 !default;
$buddylist-action-font-size: 1.6em; $buddylist-action-font-size: 1.6em;
@ -108,22 +108,22 @@ $buddylist-action-font-size: 1.6em;
// chat // chat
$chat-width: $pane-width !default; $chat-width: $pane-width !default;
$chat-background: $componentbg !default; $chat-background: $componentbg !default;
$chat-header: rgba(255,255,255,0.9) !default; $chat-header: rgba(255, 255, 255, .9) !default;
$chat-disabled: #aaa !default; $chat-disabled: #aaa !default;
$chat-badge: #84b819 !default; $chat-badge: #84b819 !default;
$chat-ctrl: rgba(0, 0, 0, .3) !default; $chat-ctrl: rgba(0, 0, 0, .3) !default;
$chat-timestamp: #aaa !default; $chat-timestamp: #aaa !default;
$chat-meta: #aaa !default; $chat-meta: #aaa !default;
$chat-msg-background: white !default; $chat-msg-background: #fff !default;
$chat-msg-border: transparent !default; $chat-msg-border: transparent !default;
$chat-msg-shadow: rgba(0, 0, 0, 0.03) !default; $chat-msg-shadow: rgba(0, 0, 0, .03) !default;
$chat-arrow-border: #eee; $chat-arrow-border: #eee;
$chat-msg-default-icon-color: #ccc !default; $chat-msg-default-icon-color: #ccc !default;
$chat-msg-unread-icon-color: #FE9A2E !default; $chat-msg-unread-icon-color: #fe9a2e !default;
$chat-msg-sending-icon-color: $chat-msg-default-icon-color !default; $chat-msg-sending-icon-color: $chat-msg-default-icon-color !default;
$chat-msg-sent-icon-color: #5882FA !default; $chat-msg-sent-icon-color: #5882fa !default;
$chat-msg-delivered-icon-color: #5882FA !default; $chat-msg-delivered-icon-color: #5882fa !default;
$chat-msg-received-icon-color: #84b819 !default; $chat-msg-received-icon-color: #84b819 !default;
$chat-msg-read-icon-color: $chat-msg-default-icon-color !default; $chat-msg-read-icon-color: $chat-msg-default-icon-color !default;
@ -134,15 +134,15 @@ $chat-msg-delivered-icon: '\f019' !default;
$chat-msg-received-icon: '\f06e' !default; $chat-msg-received-icon: '\f06e' !default;
$chat-msg-read-icon: '\f00c' !default; $chat-msg-read-icon: '\f00c' !default;
$chat-msg-self-background: white !default; $chat-msg-self-background: #fff !default;
$chat-msg-remote-background: white !default; $chat-msg-remote-background: #fff !default;
$chat-bottom-background: $chat-background !default; $chat-bottom-background: $chat-background !default;
$chat-typing: $chat-meta !default; $chat-typing: $chat-meta !default;
$chat-input-border-color: #66afe9 !default; $chat-input-border-color: #66afe9 !default;
// fileinfo // fileinfo
$fileinfo-background: white !default; $fileinfo-background: #fff !default;
$fileinfo-border: #ddd !default; $fileinfo-border: #ddd !default;
$fileinfo-icon-background-color: #eee !default; $fileinfo-icon-background-color: #eee !default;
$fileinfo-downloading-size-border: #ddd !default; $fileinfo-downloading-size-border: #ddd !default;
@ -153,14 +153,14 @@ $fileinfo-icon-background-color-remote: $fileinfo-icon-background-color !default
// settings // settings
$settings-version: #ccc !default; $settings-version: #ccc !default;
$form-help-text: #737373 !default; $form-help-text: #737373 !default;
$settings-background: white !default; $settings-background: #fff !default;
// social // social
$social-email-color: #aaa !default; $social-email-color: #aaa !default;
$social-facebook-color: #45619d !default; $social-facebook-color: #45619d !default;
$social-google-color: #dd4b39 !default; $social-google-color: #dd4b39 !default;
$social-twitter-color: #00aced !default; $social-twitter-color: #00aced !default;
$social-xing-color: white !default; $social-xing-color: #fff !default;
// useability // useability
$breakpoint-useability-small: 400px !default; $breakpoint-useability-small: 400px !default;

6
src/styles/global/_views.scss

@ -22,12 +22,14 @@
.mainview { .mainview {
bottom: 0; bottom: 0;
display: none; display: none;
left: 0px; left: 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: $minbarheight; top: $minbarheight;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
left: 0px; left: 0;
left: 0;
} }
} }

60
src/styles/main.scss

@ -20,37 +20,37 @@
*/ */
// must set custom compass variables before import of compass // must set custom compass variables before import of compass
@import "global/variables"; @import 'global/variables';
@import "compass"; @import 'compass';
@import "libs/libs"; @import 'libs/libs';
@import "global/mixins"; @import 'global/mixins';
@import "global/base"; @import 'global/base';
@import "global/loader"; @import 'global/loader';
@import "global/views"; @import 'global/views';
@import "global/pages"; @import 'global/pages';
@import "global/nicescroll"; @import 'global/nicescroll';
@import "global/animations"; @import 'global/animations';
@import "global/overlaybar"; @import 'global/overlaybar';
@import "global/withs"; @import 'global/withs';
@import "components/rightslide"; @import 'components/rightslide';
@import "components/bar"; @import 'components/bar';
@import "components/buddylist"; @import 'components/buddylist';
@import "components/buddypicturecapture"; @import 'components/buddypicturecapture';
@import "components/buddypictureupload"; @import 'components/buddypictureupload';
@import "components/settings"; @import 'components/settings';
@import "components/chat"; @import 'components/chat';
@import "components/usability"; @import 'components/usability';
@import "components/audiolevel"; @import 'components/audiolevel';
@import "components/fileinfo"; @import 'components/fileinfo';
@import "components/audiovideo"; @import 'components/audiovideo';
@import "components/screenshare"; @import 'components/screenshare';
@import "components/roombar"; @import 'components/roombar';
@import "components/social"; @import 'components/social';
@import "components/contactsmanager"; @import 'components/contactsmanager';
@import "components/presentation"; @import 'components/presentation';
@import "components/youtubevideo"; @import 'components/youtubevideo';
@import "shame"; @import 'shame';

2
static/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long

2
static/css/font-awesome.min.css vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save