diff --git a/Thermo.Active/wwwroot/assets/styles/base/piece.less b/Thermo.Active/wwwroot/assets/styles/base/piece.less index 8d9d0c59..60f73d27 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/piece.less +++ b/Thermo.Active/wwwroot/assets/styles/base/piece.less @@ -1,93 +1,134 @@ // out: false, sourceMap: false, main: ../style.less -.menu_grid{ - display: grid; - grid-template-rows: repeat(2,auto); - grid-template-columns: repeat(5,20%); +.menu_grid { + display : grid; + grid-template-rows : repeat(2, auto); + grid-template-columns: repeat(5, 20%); - .piece_info{ - grid-row: 1; + .piece_info { + grid-row : 1; grid-column-start: 1; - grid-column-end:-1; - display: flex; - align-items: center; - justify-content: space-evenly; - height: 84px; - border-bottom: 2px solid black; - - label{ - font-size: 54px; + grid-column-end : -1; + display : flex; + align-items : center; + justify-content : space-evenly; + height : 84px; + border-bottom : 2px solid black; + + label { + font-size : 54px; font-weight: 500; - text-align: right; - color: #4b4b4b; + text-align : right; + color : #4b4b4b; } - - div{ - height: 53px; - display: flex; - flex-flow: column; - justify-content: space-evenly ; - - span{ - font-family: "Work Sans"; - font-weight: 500; - line-height: 1; + + div { + height : 53px; + display : flex; + flex-flow : column; + justify-content: space-evenly; + + span { + font-family : "Work Sans"; + font-weight : 500; + line-height : 1; letter-spacing: normal; - text-align: center; - color: #4b4b4b; - - &:first-of-type{ - font-size: 12px; + text-align : center; + color : #4b4b4b; + + &:first-of-type { + font-size : 12px; text-transform: uppercase; } - - &:last-of-type{ + + &:last-of-type { font-size: 25px; } - + } } - - i{ + + i { height: 30px; - width: 30px; + width : 30px; cursor: pointer; } - - } - - .sub_menu{ - grid-row: 2; - grid-column-start: 2; - grid-column-end: -1; - display: grid; - grid-template-rows: repeat(3,60px); - grid-template-columns: repeat(4,20%); - - .piece_info{ - height: 60px; - button{ - background-color: white; - border-color: black; - border-radius: 50%; - width: 50px; - height: 50px; - } - - } - - .row_1{ - grid-row: 1; - } - - .row_2{ - grid-row: 2; - } - - .row_3{ - grid-row: 3; - } - } -} + + .sub_menu { + grid-row : 2; + grid-column-start : 2; + grid-column-end : -1; + display : grid; + grid-template-rows : repeat(3, 60px); + + .piece_info { + height: 60px; + display : grid; + grid-template-columns: repeat(4, 25%); + + button { + margin: auto; + background-color: white; + border-color : black; + border-radius : 50%; + width : 50px; + height : 50px; + } + + } + + .row_1 { + grid-row: 1; + + button { + grid-column: 1; + } + + div { + grid-column: 2; + + &:last-of-type { + grid-column: 3; + } + + } + } + + .row_2 { + grid-row: 2; + + div { + grid-column: 2; + + &:first-of-type{ + grid-column: 1; + } + + &:last-of-type { + grid-column: 3; + } + + } + } + + .row_3 { + grid-row: 3; + + div { + grid-column: 2; + + &:first-of-type{ + grid-column: 1; + } + + &:last-of-type { + grid-column: 3; + } + + } + } + + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index e0eadc95..889d8fae 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4155,12 +4155,14 @@ article .box .body { grid-column-end: -1; display: grid; grid-template-rows: repeat(3, 60px); - grid-template-columns: repeat(4, 20%); } .menu_grid .sub_menu .piece_info { height: 60px; + display: grid; + grid-template-columns: repeat(4, 25%); } .menu_grid .sub_menu .piece_info button { + margin: auto; background-color: white; border-color: black; border-radius: 50%; @@ -4170,12 +4172,39 @@ article .box .body { .menu_grid .sub_menu .row_1 { grid-row: 1; } +.menu_grid .sub_menu .row_1 button { + grid-column: 1; +} +.menu_grid .sub_menu .row_1 div { + grid-column: 2; +} +.menu_grid .sub_menu .row_1 div:last-of-type { + grid-column: 3; +} .menu_grid .sub_menu .row_2 { grid-row: 2; } +.menu_grid .sub_menu .row_2 div { + grid-column: 2; +} +.menu_grid .sub_menu .row_2 div:first-of-type { + grid-column: 1; +} +.menu_grid .sub_menu .row_2 div:last-of-type { + grid-column: 3; +} .menu_grid .sub_menu .row_3 { grid-row: 3; } +.menu_grid .sub_menu .row_3 div { + grid-column: 2; +} +.menu_grid .sub_menu .row_3 div:first-of-type { + grid-column: 1; +} +.menu_grid .sub_menu .row_3 div:last-of-type { + grid-column: 3; +} .dashboard { font-family: "Work Sans"; height: calc(100% - 60px);