fix(ui): some design review fixes
This commit is contained in:
parent
1be50a4b5b
commit
7866ba24b3
5 changed files with 12 additions and 5 deletions
|
|
@ -59,6 +59,7 @@ function Multiview({
|
|||
};
|
||||
|
||||
const returnToList = () => {
|
||||
assistMultiviewStore.reset()
|
||||
history.push(withSiteId(assist(), siteId));
|
||||
};
|
||||
|
||||
|
|
@ -85,7 +86,7 @@ function Multiview({
|
|||
<div className="w-full p-4 flex justify-between items-center">
|
||||
<div>
|
||||
{/* @ts-ignore */}
|
||||
<BackLink label="Back to sessions list" onClick={returnToList} />
|
||||
<BackLink label="Exit to sessions list" onClick={returnToList} />
|
||||
</div>
|
||||
<div>{`Watching ${assistMultiviewStore.sessions.length} of ${total} Live Sessions`}</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import cn from 'classnames';
|
||||
import { Icon, Tooltip } from 'UI';
|
||||
import { Icon } from 'UI';
|
||||
import { useStore } from 'App/mstore';
|
||||
import { observer } from 'mobx-react-lite';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ function PlayerBlockHeader(props: any) {
|
|||
{!hideBack && (
|
||||
<div
|
||||
className="flex items-center h-full cursor-pointer group"
|
||||
onClick={() => (isMultiview ? openGrid() : backHandler())}
|
||||
onClick={() => (assistMultiviewStore.sessions.length > 1 || isMultiview ? openGrid() : backHandler())}
|
||||
>
|
||||
{isMultiview ? (
|
||||
{assistMultiviewStore.sessions.length > 1 || isMultiview ? (
|
||||
<>
|
||||
<div className="rounded-full border group-hover:border-teal group-hover:text-teal group-hover:fill-teal p-1 mr-2">
|
||||
<Icon name="close" color="inherit" size={13} />
|
||||
|
|
|
|||
|
|
@ -115,5 +115,6 @@ export default class AssistMultiviewStore {
|
|||
reset() {
|
||||
this.sessions = [];
|
||||
this.activeSession = null;
|
||||
this.onChangeCb = undefined
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
const colors = require('./app/theme/colors');
|
||||
const defaultColors = require('tailwindcss/colors')
|
||||
|
||||
console.log(defaultColors);
|
||||
module.exports = {
|
||||
// important: true,
|
||||
content: [
|
||||
|
|
@ -106,7 +108,10 @@ module.exports = {
|
|||
// 'zIndex'
|
||||
// ],
|
||||
theme: {
|
||||
colors,
|
||||
colors: {
|
||||
...defaultColors,
|
||||
...colors,
|
||||
},
|
||||
// borderColor: {
|
||||
// default: '#DDDDDD',
|
||||
// "gray-light-shade": colors["gray-light-shade"],
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue