Skip to content

Commit

Permalink
React Toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
idainatovych authored and lyubomir committed Apr 3, 2017
1 parent 0d7cb63 commit da4425b
Show file tree
Hide file tree
Showing 30 changed files with 3,226 additions and 1,499 deletions.
5 changes: 5 additions & 0 deletions conference.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import analytics from './modules/analytics/analytics';

import EventEmitter from "events";

import { showDesktopSharingButton } from './react/features/toolbar';

import {
AVATAR_ID_COMMAND,
AVATAR_URL_COMMAND,
Expand Down Expand Up @@ -583,6 +585,9 @@ export default {
APP.connection = connection = con;
this.isDesktopSharingEnabled =
JitsiMeetJS.isDesktopSharingEnabled();

APP.store.dispatch(showDesktopSharingButton());

APP.remoteControl.init();
this._createRoom(tracks);

Expand Down
14 changes: 0 additions & 14 deletions css/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,4 @@
@include keyframes(slideInExtContainer) {
from { width: 0; }
to { width: $sidebarWidth; }
}

/**
* Fade in / out animations
**/

@include keyframes(fadeIn) {
from { opacity: 0; }
to { opacity: 1; }
}

@include keyframes(fadeOut) {
from { opacity: 1; }
to { opacity: 0; }
}
5 changes: 4 additions & 1 deletion css/_notice.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
.notice {
position: relative;
position: absolute;
left: 50%;
z-index: $zindex3;
margin-top: 6px;

@include transform(translateX(-50%));

&__message {
background-color: #000000;
color: white;
Expand Down
Loading

0 comments on commit da4425b

Please sign in to comment.