diff --git a/client/instance.css b/client/instance.css index 984e4917..fdd7d1a2 100644 --- a/client/instance.css +++ b/client/instance.css @@ -3,83 +3,59 @@ */ .instance { - height: 100%; + display: grid; + grid-template-columns: 1fr 1fr 1fr; + grid-template-rows: min-content min-content 1fr 2fr; + + grid-template-areas: + "top top top" + "vbox vbox info" + "equip equip info" + "cryps cryps info"; } -.instance-info { - flex: 0 1 35%; - padding-left: 1em; +.instance .top { + grid-area: top; } -.instance .spacer { - flex-grow: 1 +.instance .info { + margin-left: 1em; + grid-area: info; } -.vbox-top { - display: flex; - flex: 1; +.instance .cryps { + grid-area: cryps; } -.vbox { - display: flex; - flex: 0 0 65%; -} - -.vbox-box { - display: flex; - flex-flow: row wrap; - padding-right: 5%; - flex: 0 0 50%; -} - -.vbox-inventory { - display: flex; - flex-flow: row wrap; - flex: 0 0 50%; -} - -.ready:hover { - transition-property: all; - transition-duration: 0.5s; - transition-timing-function: ease; - color: forestgreen; - border-color: forestgreen; - /*box-shadow: inset -0.5em 0 0 0 forestgreen;*/ -} - -.ready { - color: forestgreen; - border-color: forestgreen; - box-shadow: inset -0.5em 0 0 0 forestgreen; -} - -.timer-container { - display: flex; - flex: 1 1 100%; - width: 100%; - height: 0.25em; - max-height: 0.25em; - - border: none; - margin: 1em 0; -} - -.timer { - background: whitesmoke; - transition-property: all; - transition-duration: 0.5s; - transition-delay: 0; - transition-timing-function: ease; - -} - -.instance-ui-btn { - font-size: 100%; - padding: 0; - margin: 0; +.instance .equip { + grid-area: equip; } /* VBOX */ +.vbox { + grid-area: vbox; + + display: grid; + grid-template-rows: min-content min-content; + grid-template-areas: + "vbox combiner" + "vbox inventory"; +} + +.vbox-box { + grid-area: vbox; +} + +.vbox-inventory { + grid-area: inventory; + margin-left: 1em; +} + +.vbox-combiner { + margin-left: 1em; + grid-area: combiner; +} + .vbox-btn:active, .vbox-btn:hover, .vbox-btn:focus { color: black; @@ -106,8 +82,8 @@ line-height: 1em; } -.vbox-btn { - flex: 1 0 100%; +.vbox button { + width: 100%; margin: 0; background-color: whitesmoke; color: black; @@ -118,7 +94,6 @@ color: black; } - .vbox-table td { transition-property: all; transition-duration: 0.5s; @@ -132,16 +107,12 @@ color: black; } -.spacer { - flex: 1 0 25%; -} +/* CRYP LIST */ -/* CRYP BOX */ - -.instance-cryp-list { - flex: 1; - display: flex; - flex-flow: row; +.cryp-list { + grid-area: cryps; + display: grid; + grid-template-columns: 1fr 1fr 1fr; } .instance-cryp { @@ -178,6 +149,11 @@ .instance-cryp img { grid-area: avatar; + min-width: 150px; +} + +.instance-cryp .name { + text-align: center; } .instance-cryp .avatar figure { @@ -253,7 +229,6 @@ fill: none; } - .instance-cryp .stat-icon { width: 100%; } @@ -361,7 +336,6 @@ button.equip { 100% { color: #7a7a7a; stroke: #7a7a7a; - } } diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 3b5b07ba..9b323cb1 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -205,7 +205,7 @@ function Info(args) { // ?