Commit 7252cf24 authored by liujiaxin's avatar liujiaxin

调整图标,调整颜色选择器

parent 6236ec53
...@@ -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 ?
......
...@@ -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}><RecordVoiceOverIcon/></div> ? <div className="tool-btn" onClick={audioOn}><VoiceOverOffIcon/></div>
: <div onClick={audioOff} className="tool-btn"><VoiceOverOffIcon/></div> : <div onClick={audioOff} className="tool-btn"><RecordVoiceOverIcon/></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>
......
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
height: 100%; height: 100%;
.sketch-picker { .sketch-picker {
top: 183px; top: 183px;
left: 63px; right: 63px;
z-index: 5; z-index: 5;
position: absolute; position: absolute;
pointer-events: all; pointer-events: all;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment