This commit is contained in:
ntr 2019-06-03 23:46:19 +10:00
parent 7e8e320c7d
commit 8561165eb3
4 changed files with 31 additions and 64 deletions

View File

@ -163,12 +163,11 @@
.construct-list { .construct-list {
grid-area: constructs; grid-area: constructs;
display: flex;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
} }
.instance-construct, .instance-construct-active { .instance-construct {
flex: 1;
display: grid; display: grid;
grid-template-rows: min-content min-content min-content 1fr min-content; grid-template-rows: min-content min-content min-content 1fr min-content;
grid-template-areas: grid-template-areas:
@ -178,13 +177,12 @@
"avatar " "avatar "
"stats "; "stats ";
/*margin: 0 2em;*/
padding: 0.5em; padding: 0.5em;
border: 2px solid #222; border: 2px solid #222;
border-left-width: 0; border-left-width: 0;
} }
.instance-construct:first-child, .instance-construct-active:first-child { .instance-construct:first-child {
margin-left: 0; margin-left: 0;
border-left-width: 1px; border-left-width: 1px;
} }

View File

@ -2,7 +2,7 @@
.instance { .instance {
display: grid; display: grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-template-rows: min-content, 1fr; grid-template-rows: min-content 1fr;
grid-template-areas: grid-template-areas:
"vbox" "vbox"
"constructs"; "constructs";
@ -41,15 +41,12 @@
} }
.instance.constructs-visible .construct-list { .instance.constructs-visible .construct-list {
grid-area: constructs; display: flex;
display: grid; flex-flow: row;
justify-content: center; align-content: flex-end;
height: 100%;
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr;
} }
.vbox-inventory { .vbox-inventory {
margin-left: 0; margin-left: 0;
} }
@ -58,49 +55,12 @@
margin-left: 0; margin-left: 0;
} }
.construct-list .skills {
flex-flow: row;
align-items: stretch;
}
.equip { .equip {
border: none; border: none;
} }
.instance-construct { .instance-construct {
grid-row: 2; flex: 1;
display: grid;
grid-template-rows: min-content 1fr;
grid-template-areas:
"name "
"avatar ";
padding: 0.5em;
border: none;
transition-property: all;
transition-duration: 0.5s;
transition-delay: 0;
transition-timing-function: ease;
}
.instance-construct .skills {
display: none;
}
.instance-construct .specs {
display: none;
}
.instance-construct .stats {
display: none;
}
.instance-construct-active .avatar {
min-height: 150px;
}
.instance-construct-active {
grid-row: 1;
grid-column: 1 / 3;
display: grid; display: grid;
grid-template-rows: min-content min-content min-content 1fr min-content; grid-template-rows: min-content min-content min-content 1fr min-content;
grid-template-areas: grid-template-areas:
@ -110,24 +70,37 @@
"avatar " "avatar "
"stats "; "stats ";
padding: 0.5em; border-top: 1px solid #222;
border: none;
transition-property: all; transition-property: all;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-delay: 0; transition-delay: 0;
transition-timing-function: ease; transition-timing-function: ease;
} }
.instance-construct-active .specs { .instance-construct:not(:last-child) {
border-right: 1px solid #222;
}
.instance-construct .specs {
margin: 0; margin: 0;
} }
.instance-construct-active img { .construct-list .stats {
width: 55px; flex-flow: row wrap;
} }
.instance-construct:last-child { .construct-list .stats figcaption {
border-left: 1px solid #222; font-size: 75%;
}
.instance-construct .stats figure.speed {
order: -1;
flex: 1 0 100%;
}
.instance-construct .stats figure {
flex: 1 0 33%;
} }
.instance-nav { .instance-nav {

View File

@ -521,7 +521,6 @@ main .top button {
} }
.timer { .timer {
flex: 1 0 100%;
background: whitesmoke; background: whitesmoke;
transition-property: all; transition-property: all;
transition-duration: 0.5s; transition-duration: 0.5s;

View File

@ -199,11 +199,8 @@ function Construct(props) {
</figure>; </figure>;
}); });
const activeId = activeConstruct ? activeConstruct.id : false;
const constructClass = activeId === construct.id ? 'instance-construct-active' : 'instance-construct';
return ( return (
<div key={construct.id} className={constructClass} onClick={onClick} > <div key={construct.id} class="instance-construct" onClick={onClick} >
<ConstructAvatar name={construct.name} id={construct.id} /> <ConstructAvatar name={construct.name} id={construct.id} />
<h2 className="name" >{construct.name}</h2> <h2 className="name" >{construct.name}</h2>
<div className="skills" onMouseOver={e => hoverInfo(e, 'constructSkills')} > <div className="skills" onMouseOver={e => hoverInfo(e, 'constructSkills')} >