Merge branch 'RC1-1.0' of https://github.com/havfo/multiparty-meeting into RC1-1.0

This commit is contained in:
Håvar Aambø Fosstveit committed 2018-11-16 12:01:05 +01:00
commit a67a7aa8b3
2 files changed
+1 -5

No files matched your search

@@ -27,7 +27,7 @@ class ToolAreaButton extends React.Component
className={classnames('button toolarea-button', { className={classnames('button toolarea-button', {
on : toolAreaOpen on : toolAreaOpen
})} })}
data-tip='Open tool box' data-tip='Open tools'
data-type='dark' data-type='dark'
onClick={() => toggleToolArea()} onClick={() => toggleToolArea()}
/> />
-4
View File
@@ -158,10 +158,6 @@
background-image: url('/resources/images/icon_tool_area_black.svg'); background-image: url('/resources/images/icon_tool_area_black.svg');
} }
} }
&.toolarea-close-button {
background-image: url('/resources/images/arrow_right.svg');
}
} }
> .badge { > .badge {