Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
This commit is contained in:
commit
3d7573b65e
4 changed files with 87 additions and 45 deletions
|
|
@ -57,7 +57,7 @@ const parentTab = {
|
|||
marginTop: "4px",
|
||||
marginLeft: "4px",
|
||||
animationDuration: "10s",
|
||||
background: "rgba(150, 150, 150, 0)",
|
||||
// background: "rgba(150, 150, 150, 0)",
|
||||
|
||||
borderRadius: "-5px",
|
||||
borderTopLeftRadius: "6px",
|
||||
|
|
@ -100,7 +100,7 @@ const useStyles = makeStyles((theme: Theme) => {
|
|||
minWidth: theme.spacing(8),
|
||||
left: 0,
|
||||
height: "100%",
|
||||
background: theme.palette.background.paper
|
||||
// background: theme.palette.background.paper
|
||||
},
|
||||
searchTabExpanded: {
|
||||
...parentTab,
|
||||
|
|
@ -108,22 +108,25 @@ const useStyles = makeStyles((theme: Theme) => {
|
|||
minWidth: theme.spacing(30),
|
||||
left: 0,
|
||||
height: "100%",
|
||||
background: theme.palette.background.paper
|
||||
// background: theme.palette.background.paper
|
||||
},
|
||||
tab: {
|
||||
...parentTab,
|
||||
color: theme.palette.text.primary
|
||||
},
|
||||
smallTab: {
|
||||
...parentTab,
|
||||
width: theme.spacing(8),
|
||||
minWidth: theme.spacing(8),
|
||||
background: theme.palette.background.paper
|
||||
// background: theme.palette.background.paper
|
||||
},
|
||||
selectedTab: {
|
||||
borderRadius: "-5px",
|
||||
borderTopLeftRadius: "6px",
|
||||
borderTopRightRadius: "6px",
|
||||
background: theme.palette.background.default,
|
||||
// "linear-gradient(rgba(150, 150, 150, 0.3),"
|
||||
// + theme.palette.background.default + " 80%)"
|
||||
"&:hover": {
|
||||
background:
|
||||
"linear-gradient(rgba(150, 150, 150, 0.3)," + theme.palette.background.default + " 80%)"
|
||||
|
|
@ -139,11 +142,11 @@ const useStyles = makeStyles((theme: Theme) => {
|
|||
width: 36,
|
||||
height: 36,
|
||||
borderRadius: "18px",
|
||||
background: "rgba(0,0,0,0)",
|
||||
"&:hover": {
|
||||
background:
|
||||
"radial-gradient(closest-side, rgba(150, 150, 150, 0.5) 50%, rgba(150, 150, 150, 0.5))"
|
||||
}
|
||||
// background: "rgba(0,0,0,0)",
|
||||
// "&:hover": {
|
||||
// background:
|
||||
// "radial-gradient(closest-side, rgba(150, 150, 150, 0.5) 50%, rgba(150, 150, 150, 0.5))"
|
||||
// }
|
||||
},
|
||||
tabText: {
|
||||
position: "absolute",
|
||||
|
|
@ -678,6 +681,7 @@ export default function BinYard(props: Props) {
|
|||
<DraggableTabs
|
||||
variant="scrollable"
|
||||
scrollButtons="auto"
|
||||
sx={{ background: theme.palette.background.paper }}
|
||||
value={tab}
|
||||
TabIndicatorProps={{ style: { background: "rgba(0,0,0,0)" } }}
|
||||
onChange={(_, newValue) => {
|
||||
|
|
@ -759,7 +763,6 @@ export default function BinYard(props: Props) {
|
|||
<Tab
|
||||
classes={{ root: classes.tab, selected: classes.selectedTab }}
|
||||
key={index}
|
||||
draggable
|
||||
sx={{
|
||||
textAlign: "left",
|
||||
}}
|
||||
|
|
@ -789,7 +792,6 @@ export default function BinYard(props: Props) {
|
|||
/>
|
||||
</Tooltip>
|
||||
))}
|
||||
|
||||
{/* {grainBags.length > 0 && (
|
||||
<Tab
|
||||
classes={{ root: classes.smallTab, selected: classes.selectedTab }}
|
||||
|
|
@ -804,4 +806,4 @@ export default function BinYard(props: Props) {
|
|||
</DraggableTabs>
|
||||
</AppBar>
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue