Commit Graph

181 Commits

Author SHA1 Message Date
Maxim Khlobystov
60ad8ab631 Adjusted the size of the Settings modal window in mobile view. 2015-05-26 13:21:56 -07:00
Maxim Khlobystov
531ada09df Moved the inline CSS related to the Settings modal window to the LESS file. 2015-05-26 12:45:48 -07:00
Maxim Khlobystov
06496b4835 Made the Settings button functional in portrait orientation. 2015-05-26 11:05:19 -07:00
Maxim Khlobystov
6ca9bb1465 Got back the label indicating the current slide's number. 2015-05-25 15:27:06 -07:00
Maxim Khlobystov
b8e32bf316 Added the presenter's slide navigation to the new UI. 2015-05-25 14:36:43 -07:00
Oleksandr Zhurbenko
933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
2015-05-24 20:32:13 -07:00
Oleksandr Zhurbenko
42515fd477 Private chat styling 2015-05-24 20:24:21 -07:00
Maxim Khlobystov
1487a0e28c Removed the userlist's X button from the portrait view. 2015-05-21 09:37:21 -07:00
Maxim Khlobystov
ef88685536 Changed the colour of a menu toggle button when its menu is opened. 2015-05-21 09:33:27 -07:00
Maxim Khlobystov
9731fcd8d1 Made the cursor a hand when hovering the darkened screen pushed by the menu. 2015-05-20 17:03:06 -07:00
Maxim Khlobystov
8dbd263f00 Made sure there's no white space between slide and chat in portrait orientation. 2015-05-20 16:01:25 -07:00
Maxim Khlobystov
4939f53ed8 Corrected the proportion between whiteboard and chat in landscape mode. 2015-05-20 15:49:53 -07:00
Maxim Khlobystov
e83e765f45 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-new-ui 2015-05-20 15:01:39 -07:00
perroned
97ebd8cc81 Remove unused code 2015-05-19 08:53:33 -07:00
perroned
bd79b2c4db Fix ordering of panels 2015-05-19 08:53:17 -07:00
perroned
5a11416022 Reverting most of whiteboard 2015-05-19 08:35:12 -07:00
perroned
102cbef168 shrink notification area's height 2015-05-19 07:07:05 -07:00
perroned
c68693e5fb Elements are now sized properly through CSS 2015-05-15 13:17:33 -07:00
Maxim Khlobystov
a1bf92d6c7 Beginning work on the right-hand side menu styling. 2015-05-15 11:02:51 -07:00
Maxim Khlobystov
ccf8b7372b Limited the translucent shield to the portrait orientation. 2015-05-14 14:14:19 -07:00
Maxim Khlobystov
afad44d7b2 Corrected the position of the translucent shield on mobile devices. 2015-05-14 13:50:43 -07:00
Maxim Khlobystov
a96301d8ef Added a translucent shield atop the main page content when one of the sliding menus is open. 2015-05-14 13:47:29 -07:00
Maxim Khlobystov
156017ffa2 Made the right-hand side menu only visible in portrait orientation. 2015-05-14 12:17:07 -07:00
perroned
74a96b45db Fix whiteboard vertical centering 2015-05-14 11:09:14 -07:00
perroned
efca225a83 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/views/users/users_list.html
2015-05-13 12:05:34 -07:00
perroned
0bd69867b0 Major clean up 2015-05-13 11:55:15 -07:00
Maxim Khlobystov
437f12c1b7 Synced the landscape and portrait userlist menus. 2015-05-13 10:49:09 -07:00
perroned
98b063d199 Fix panel heights to be even and use the entire window 2015-05-13 07:39:22 -07:00
perroned
56ed1deb7d Logout modal. Fixed settings 2015-05-13 07:24:21 -07:00
perroned
617e34cd62 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications
Conflicts:
	bigbluebutton-html5/app/client/views/sharedTemplates.html
2015-05-12 12:31:38 -07:00
perroned
20d653fdc7 Made notifications bigger for mobile use 2015-05-12 12:20:54 -07:00
perroned
ba227a8914 Proper height for notifications on mobile and portrait oreintations/views 2015-05-12 12:11:07 -07:00
perroned
3ee8db8dea Attach notification to viewport, not page 2015-05-12 12:10:26 -07:00
Maxim Khlobystov
8ef9adba94 Made the Logout button work in landscape mode. 2015-05-12 11:57:07 -07:00
Maxim Khlobystov
928e856107 Added the buttons to the right-hand side menu. 2015-05-12 11:07:30 -07:00
Maxim Khlobystov
ad923ab1ad Added the layout for the right-hand side sliding menu. 2015-05-12 09:51:06 -07:00
perroned
e8004b6073 Fixed audio notifications 2015-05-12 07:48:11 -07:00
Maxim Khlobystov
4a464b0e3f Started using the landscape mode's userlist for the sliding menu. 2015-05-11 14:34:53 -07:00
perroned
0b910cfd00 Notification manager 2015-05-11 13:02:11 -07:00
perroned
64bdfe7aa9 Restructuring/moving 2015-05-10 21:43:31 -07:00
perroned
9490e5971a 2 lines does not induce scrolling in chat input box 2015-05-08 11:12:41 -07:00
perroned
f75250ba59 Merge remote-tracking branch 'perroned/summit-desktop-settings' into foundation-notifications 2015-05-08 11:08:50 -07:00
perroned
cad805f77a Fix conflict 2015-05-08 11:06:33 -07:00
perroned
ade07c0d15 chat only scrolls when needed 2015-05-08 10:13:21 -07:00
Maxim Khlobystov
f4418f6109 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-client-new-ui
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
2015-05-08 12:07:07 -04:00
Oleksandr Zhurbenko
1e3bdb380d Corrected icons 2015-05-08 09:02:15 -07:00
Maxim Khlobystov
e46ef7afa3 Added the toggle button for the right-hand side menu and made sure the landscape/portrait navbar only shows the appropriate buttons. 2015-05-08 11:58:51 -04:00
Oleksandr Zhurbenko
6d2a4414a7 Fixed settings and userlist icons' positioning 2015-05-08 08:53:37 -07:00
Maxim Khlobystov
8103bb2903 Fixed the position of the navbar buttons. 2015-05-08 10:27:52 -04:00
Maxim Khlobystov
0c478393f3 Recovered the styling of presenter's slides control. 2015-05-07 22:17:26 -04:00
Oleksandr Zhurbenko
7951a848fc Fixed whiteboard positioning 2015-05-07 16:14:36 -07:00
Maxim Khlobystov
e1cad84bd5 Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui
Conflicts:
	bigbluebutton-html5/app/client/main.coffee
2015-05-07 19:04:51 -04:00
Maxim Khlobystov
7829adfa3c Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 2015-05-07 18:29:52 -04:00
Maxim Khlobystov
e2909d6304 Added the left-hand sliding menu in portrait mode. 2015-05-07 18:16:43 -04:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
perroned
840c4965a5 Restyled chatbar 2015-05-06 22:33:13 -07:00
perroned
029b90f2b1 Using Ion icons for user list audio 2015-05-06 21:53:29 -07:00
perroned
cdc8408cb5 Removing spacing from modules 2015-05-06 21:27:17 -07:00
perroned
539fda349e Removed title for chat and whiteboard 2015-05-06 21:17:59 -07:00
perroned
a241c75093 Use foundation icons for users list 2015-05-06 21:14:17 -07:00
perroned
bbbcc3061c save/cancel changes from settings dialog, more UI 2015-05-06 19:41:58 -07:00
perroned
6a5bddef5e Modal menu's for Foundation 2015-05-06 16:11:59 -07:00
perroned
bae564901e make buttons appear 2015-05-06 16:05:56 -07:00
perroned
bf67593fa1 Conflicts 2015-05-06 16:05:34 -07:00
perroned
028951d51d Updating UI for Foundation framework 2015-05-06 15:08:49 -07:00
Oleksandr Zhurbenko
eae2f7dbf3 Merge branch 'meteor-client-new-ui' of https://github.com/gthacoder/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
2015-05-06 14:42:01 -07:00
Oleksandr Zhurbenko
9dff47ef02 Moved a whiteboard's document name from the whiteboard-navbar to the main navbar 2015-05-06 14:22:48 -07:00
Maxim Khlobystov
7897f01a82 Positioned the whiteboard and chat vertically in portrait mode. 2015-05-06 16:32:25 -04:00
Oleksandr Zhurbenko
642c28dc1d Got rid of the second body tag, fixed a whitespace under userlist 2015-05-06 12:59:00 -07:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Oleksandr Zhurbenko
10851cf521 Merge 2015-05-06 12:50:16 -07:00
Maxim Khlobystov
b4ed87cbd7 Eliminated the gap above the portrait navbar by changing the way we set the page title. 2015-05-06 15:41:46 -04:00
Oleksandr Zhurbenko
04724c2a24 Removed scrolling in landscape and fixed whiteboard's poitioning 2015-05-06 12:33:15 -07:00
Maxim Khlobystov
1fec37c2c8 Made sure the standard userlist doesn't show up in portrait orientation. 2015-05-06 15:28:30 -04:00
Oleksandr Zhurbenko
3851b95f15 Fixed the positioning of chat input textarea 2015-05-06 12:15:27 -07:00
Oleksandr Zhurbenko
698ccf5c4f Getting rid of a footer 2015-05-06 12:08:57 -07:00
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04:00
Maxim Khlobystov
cabaf10283 Moved the navbar from Bootstrap to Foundation. 2015-05-05 10:30:38 -04:00
perroned
8e2ce8c82c resolve merge conflicts 2015-04-27 09:55:20 -07:00
perroned
c51d4a9633 modularize notification code. Notification helpers. Some redesigned CSS 2015-04-27 08:12:12 -07:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
2015-04-22 14:50:30 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
2015-04-22 06:03:46 -07:00
Anton Georgiev
7171c47656 cleaning up 2015-04-21 21:42:34 +00:00
Anton Georgiev
45f5c8b298 wrapping chat tabs; bigger easel icon on mobile 2015-04-21 15:19:52 +00:00
Anton Georgiev
f74115c9f2 fixed spacing in userslist; Users:X with same behav as in the Flash player 2015-04-21 15:14:49 +00:00
Anton Georgiev
5cb3a9bd9c Active button hover states; rm left and right border 2015-04-20 20:57:48 +00:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Anton Georgiev
285b8c0e44 removed Send tooltip + blue border on chat tab 2015-04-20 17:50:05 +00:00
perroned
eb2c5fc456 Prevent controls from moving around while clicking 2015-04-16 06:41:53 -07:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
Maxim Khlobystov
b8e32da12d Added the fix for the bug with a tiny whiteboard to a portrait view. 2015-04-10 17:53:43 -07:00
Maxim Khlobystov
dc9e8e46d0 Fixed the issue with a tiny whiteboard on initial page load without the whiteboard cookies set (fixed in landscape only). 2015-04-10 17:17:37 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
2015-04-10 19:21:40 +00:00
perroned
0a887bfbc5 Fix navbar UI when in listen only 2015-04-02 09:19:55 -07:00
Anton Georgiev
e1c4ae5f48 Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
2015-04-02 15:27:41 +00:00
perroned
36fdde74d7 Cleaned and added listen only icon 2015-04-02 08:08:30 -07:00
Maxim Khlobystov
dfa30d2193 Corrected the size of the full screen button. 2015-03-31 16:07:14 -07:00
perroned
adab7347ed Style for listen only dialog 2015-03-31 12:36:45 -07:00