Merge branch 'design/playground' into develop
# Conflicts: # public_new/archive_detail.html # public_new/chat_add_user.html # public_new/chat_room.html # public_new/collaboration.html # public_new/footer_collabo.html # public_new/js/archive.js # public_new/js/chat-ui.js # public_new/modal_chat_menu.html # public_new/modal_collabo_profile.html # public_new/template/template_open_collaboration_message.html # public_new/template/template_user_name_card.html
Showing

559 Bytes
public_new/icon/icon_add_member_white.svg
0 → 100644
public_new/icon/icon_add_user.png
deleted
100644 → 0

559 Bytes
public_new/icon/icon_add_user.svg
0 → 100644
public_new/icon/icon_archive.png
deleted
100644 → 0

241 Bytes
public_new/icon/icon_archive.svg
0 → 100644

242 Bytes
public_new/icon/icon_archive_gray.svg
0 → 100644
public_new/icon/icon_arrow_down.png
deleted
100644 → 0

402 Bytes
public_new/icon/icon_arrow_left.png
deleted
100644 → 0

248 Bytes
public_new/icon/icon_arrow_up.png
deleted
100644 → 0

391 Bytes
public_new/icon/icon_camera.png
deleted
100644 → 0

562 Bytes
public_new/icon/icon_camera.svg
0 → 100644
public_new/icon/icon_change_host.png
deleted
100644 → 0

451 Bytes
public_new/icon/icon_change_host.svg
0 → 100644

400 Bytes
public_new/icon/icon_change_room_name.svg
0 → 100644
public_new/icon/icon_chat.png
deleted
100644 → 0

468 Bytes
public_new/icon/icon_chat.svg
0 → 100644
public_new/icon/icon_chat_gray.png
deleted
100644 → 0

466 Bytes
public_new/icon/icon_chat_gray.svg
0 → 100644
public_new/icon/icon_close.png
deleted
100644 → 0

327 Bytes
public_new/icon/icon_close_white.png
deleted
100644 → 0

221 Bytes
public_new/icon/icon_close_white.svg
0 → 100644

507 Bytes
public_new/icon/icon_collabo_capture.svg
0 → 100644

414 Bytes

454 Bytes
public_new/icon/icon_collabo_document.svg
0 → 100644

309 Bytes

759 Bytes
public_new/icon/icon_collabo_headset.svg
0 → 100644

234 Bytes

334 Bytes
public_new/icon/icon_collabo_pen_white.svg
0 → 100644

466 Bytes

538 Bytes
public_new/icon/icon_collabo_picture.svg
0 → 100644

466 Bytes
public_new/icon/icon_collabo_place_white.svg
0 → 100644

320 Bytes

492 Bytes
public_new/icon/icon_collabo_videocam.svg
0 → 100644

1 KB

1 KB
public_new/icon/icon_collabo_whiteboard.svg
0 → 100644

638 Bytes
public_new/icon/icon_collabo_zoomin.svg
0 → 100644

602 Bytes
public_new/icon/icon_collabo_zoomout.svg
0 → 100644

488 Bytes
public_new/icon/icon_collabo_zoomout_map.svg
0 → 100644
public_new/icon/icon_contact.png
deleted
100644 → 0

356 Bytes
public_new/icon/icon_contact.svg
0 → 100644

357 Bytes
public_new/icon/icon_contact_gray.svg
0 → 100644

1.47 KB
public_new/icon/icon_end_pip.png
deleted
100644 → 0

715 Bytes
public_new/icon/icon_end_pip.svg
0 → 100644
public_new/icon/icon_favorite.png
deleted
100644 → 0

883 Bytes
public_new/icon/icon_folder.png
deleted
100644 → 0

559 Bytes
public_new/icon/icon_folder.svg
0 → 100644
public_new/icon/icon_host_tag.png
deleted
100644 → 0

421 Bytes
public_new/icon/icon_host_tag.svg
0 → 100644
public_new/icon/icon_join_room.png
deleted
100644 → 0

547 Bytes
public_new/icon/icon_join_room.svg
0 → 100644
public_new/icon/icon_leftarrow.png
deleted
100644 → 0

240 Bytes
public_new/icon/icon_make_room.png
deleted
100644 → 0

650 Bytes
public_new/icon/icon_make_room.svg
0 → 100644
public_new/icon/icon_member_blue.png
deleted
100644 → 0

870 Bytes
public_new/icon/icon_member_blue.svg
0 → 100644

732 Bytes
public_new/icon/icon_member_white.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_movie.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_movie.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_paste.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_paste.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_phone.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_phone.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_photo.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_photo.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_prev.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_prev.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_prev_top.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_prev_top.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_profile_chat.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_profile_phone.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_profile_phone_white.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_record.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_record.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_record_disable.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_room_menu.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_room_menu.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_search.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_search.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_start_pip.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_start_pip.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_talking_white.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_tell.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_tool_white.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_videocam.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_videocam.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/icon/icon_voice_gray.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_voice_white.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public_new/icon/icon_voice_white.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_voice_white_disable.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_whiteboard_gray.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public_new/icon/icon_whiteboard_white.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/js/archive.js
0 → 100644
This diff is collapsed.
Click to expand it.
public_new/js/chat-ui.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment