Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
live
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liujiaxin
live
Commits
7252cf24
Commit
7252cf24
authored
Feb 17, 2020
by
liujiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整图标,调整颜色选择器
parent
6236ec53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
mediaboard.tsx
src/components/mediaboard.tsx
+4
-4
room-tools-bar.tsx
src/components/room-tools-bar.tsx
+2
-2
whiteboard.scss
src/components/whiteboard.scss
+1
-1
No files found.
src/components/mediaboard.tsx
View file @
7252cf24
...
@@ -269,9 +269,9 @@ const items = [
...
@@ -269,9 +269,9 @@ const items = [
{
{
name
:
'
add
'
name
:
'
add
'
},
},
{
//
{
name
:
'
upload
'
//
name: 'upload'
},
//
},
{
{
name
:
'
hand_tool
'
name
:
'
hand_tool
'
},
},
...
@@ -558,7 +558,7 @@ const items = [
...
@@ -558,7 +558,7 @@ const items = [
onChangeComplete=
{
onColorChanged
}
/>
onChangeComplete=
{
onColorChanged
}
/>
:
null
}
:
null
}
</>
:
null
}
</>
:
null
}
<
UploadPanel
/>
{
/*<UploadPanel />*/
}
{
children
?
children
:
null
}
{
children
?
children
:
null
}
</
div
>
</
div
>
{
/*me.role === 'teacher' && room ?
{
/*me.role === 'teacher' && room ?
...
...
src/components/room-tools-bar.tsx
View file @
7252cf24
...
@@ -61,8 +61,8 @@ export default function RoomToolsBar (props: any) {
...
@@ -61,8 +61,8 @@ export default function RoomToolsBar (props: any) {
{
muteAudio
{
muteAudio
?
<
div
className=
"tool-btn"
onClick=
{
audioOn
}
><
RecordVoiceOver
Icon
/></
div
>
?
<
div
className=
"tool-btn"
onClick=
{
audioOn
}
><
VoiceOverOff
Icon
/></
div
>
:
<
div
onClick=
{
audioOff
}
className=
"tool-btn"
><
VoiceOverOff
Icon
/></
div
>
:
<
div
onClick=
{
audioOff
}
className=
"tool-btn"
><
RecordVoiceOver
Icon
/></
div
>
}
}
{
currentTool
==
TOOL_TYPE
.
WHITEBOARD
{
currentTool
==
TOOL_TYPE
.
WHITEBOARD
?
<
div
className=
"tool-btn"
onClick=
{
changeTool
}
><
ImportContacts
/></
div
>
?
<
div
className=
"tool-btn"
onClick=
{
changeTool
}
><
ImportContacts
/></
div
>
...
...
src/components/whiteboard.scss
View file @
7252cf24
...
@@ -399,7 +399,7 @@
...
@@ -399,7 +399,7 @@
height
:
100%
;
height
:
100%
;
.sketch-picker
{
.sketch-picker
{
top
:
183px
;
top
:
183px
;
lef
t
:
63px
;
righ
t
:
63px
;
z-index
:
5
;
z-index
:
5
;
position
:
absolute
;
position
:
absolute
;
pointer-events
:
all
;
pointer-events
:
all
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment