diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs index de8b6946..e708013b 100644 --- a/Thermo.Active.Config/ServerConfigController.cs +++ b/Thermo.Active.Config/ServerConfigController.cs @@ -611,7 +611,8 @@ namespace Thermo.Active.Config { Canale = Convert.ToInt16(y.Attribute("canale").Value), Riga = Convert.ToInt16(y.Attribute("riga").Value), - Tipo = Convert.ToInt16(y.Attribute("tipo").Value) + Tipo = Convert.ToInt16(y.Attribute("tipo").Value), + IdGruppo = Convert.ToInt16(y.Attribute("idGruppo").Value), } ) .ToList() @@ -719,7 +720,8 @@ namespace Thermo.Active.Config Column = numCol, IdChannel = resistenza.Canale, Dimension = riferimento.Dimensione, - IdReflector = riflettore.Tipo + IdReflector = riflettore.Tipo, + IdGroup = resistenza.IdGruppo, }); ; maxRow = resistenza.Riga > maxRow ? resistenza.Riga : maxRow; } diff --git a/Thermo.Active.Model/ConfigModels/RiskConfigModel.cs b/Thermo.Active.Model/ConfigModels/RiskConfigModel.cs index e1d93fbc..930834b4 100644 --- a/Thermo.Active.Model/ConfigModels/RiskConfigModel.cs +++ b/Thermo.Active.Model/ConfigModels/RiskConfigModel.cs @@ -45,7 +45,8 @@ namespace Thermo.Active.Model.ConfigModels public int Canale; public int Riga; - public int Tipo; + public int Tipo; + public int IdGruppo; #endregion Public Fields } @@ -59,6 +60,7 @@ namespace Thermo.Active.Model.ConfigModels public int Id { get; set; } = 0; public int IdChannel { get; set; } = 0; public int IdReflector { get; set; } = 0; + public int IdGroup { get; set; } = 0; public int Row { get; set; } = 0; #endregion Public Fields diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less index 426a9391..ea18b250 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/processo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less @@ -6,7 +6,7 @@ .modal.processo-info { width: 1808px; - height: calc(~'100% - 104px'); + height: calc(~'100% - 115px'); margin: 104px auto 0 auto; box-shadow: none; position: relative; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index e72655a0..4007d8be 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -5350,7 +5350,7 @@ article .box .body { } .modal.processo-info { width: 1808px; - height: calc(100% - 104px); + height: calc(100% - 115px); margin: 104px auto 0 auto; box-shadow: none; position: relative; @@ -8067,7 +8067,7 @@ footer .container button.big:before { background: #dddddd; } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tr:nth-child(odd) { - background: #FFF; + background: #fff; } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(1), .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(1) { @@ -8122,14 +8122,14 @@ footer .container button.big:before { } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody::-webkit-scrollbar-track { margin: 20px 0px; - background-color: #E5E5E5; + background-color: #e5e5e5; border-radius: 15px; - box-shadow: inset 0 1px 3px 0 #9F9F9F; + box-shadow: inset 0 1px 3px 0 #9f9f9f; } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody::-webkit-scrollbar-thumb { width: 16px; - background: #9F9F9F; - border: 4px solid #E5E5E5; + background: #9f9f9f; + border: 4px solid #e5e5e5; border-radius: 15px; } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody tr { @@ -24370,7 +24370,7 @@ body { margin-left: 10px; } body { - font-family: 'Work Sans', sans-serif; + font-family: "Work Sans", sans-serif; } .t-loading { bottom: 80px; @@ -24427,4 +24427,4 @@ body { font-family: Arial, sans-serif; font-weight: bold; text-transform: uppercase; -} \ No newline at end of file +} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less index ea8d48d5..b5cfb528 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less @@ -1,41 +1,42 @@ @import "../../../variable.less"; - -.column-page-header { - width: 672px; - margin: 0 0 0 20px; - > title { - display: flex; - justify-content: center; - font-size: 26px; - font-weight: 500; - line-height: 1.96; - text-align: center; - color: @white; - } - - .row-list { - display: flex; - flex-flow: row wrap; - a { - cursor: pointer; - height: 45px; - padding: 0 13px; - font-size: 18px; - font-weight: 500; +.main-container { + .column-page-header { + width: 672px; + margin: 0 0 0 20px; + > title { display: flex; - align-items: center; + justify-content: center; + font-size: 26px; + font-weight: 500; + line-height: 1.96; text-align: center; color: @white; - text-decoration: underline; + } - &.upper { - text-transform: uppercase; + .row-list { + display: flex; + flex-flow: row wrap; + a { + cursor: pointer; + height: 45px; + padding: 0 13px; + font-size: 18px; + font-weight: 500; + display: flex; + align-items: center; + text-align: center; + color: @white; + text-decoration: underline; + + &.upper { + text-transform: uppercase; + } } } } -} -.row-list-input { - height: 100px; + .row-list-input { + height: 100px; + } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.less index fb694084..96a547d3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.less @@ -1,44 +1,46 @@ @import "../../../../variable.less"; -th, -td { - &.input-description { - width: 350px; - max-width: 350px; - } +.main-container { + th, + td { + &.input-description { + width: 350px; + max-width: 350px; + } - &.ai { - font-weight: bold; - text-align: right; - span { - margin: 0 20px 0 10px; + &.ai { + font-weight: bold; + text-align: right; + span { + margin: 0 20px 0 10px; + } } } -} -.value-button-input-container-off, -.value-button-input-container-on { - width: 48px; - height: 25px; - margin: 20px 10px 19px 10px; - padding: 3px 0; - border-radius: 2px; - float: right; - display: flex; - justify-content: center; - align-items: center; - background-color: @greyish-brown; - &-label { + .value-button-input-container-off, + .value-button-input-container-on { width: 48px; - height: 19px; - padding: 2px 0 0 0px; - text-shadow: 0 0 4px @black-50; - font-size: 16px; - text-align: center; - color: #e8e8e8; + height: 25px; + margin: 20px 10px 19px 10px; + padding: 3px 0; + border-radius: 2px; + float: right; + display: flex; + justify-content: center; + align-items: center; + background-color: @greyish-brown; + &-label { + width: 48px; + height: 19px; + padding: 2px 0 0 0px; + text-shadow: 0 0 4px @black-50; + font-size: 16px; + text-align: center; + color: #e8e8e8; + } + } + + .value-button-input-container-on { + background-color: @clear-blue; } } - -.value-button-input-container-on { - background-color: @clear-blue; -} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.less index 45b5b954..0bb510d9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.less @@ -1,90 +1,91 @@ @import "../../../../variable.less"; - -th, -td { - &.output-description { - width: 220px; - max-width: 220px; - } - - &.force { - width: 130px; - max-width: 130px; - - input { - max-width: 100px; - height: 48px; +.main-container { + th, + td { + &.output-description { + width: 220px; + max-width: 220px; } - } - &.ai { - font-weight: bold; - text-align: right; - span { - margin: 0 20px 0 10px; + &.force { + width: 130px; + max-width: 130px; + + input { + max-width: 100px; + height: 48px; + } } - } - .do-container { - width: 130px; - display: flex; - flex-flow: row nowrap; - align-items: center; - justify-content: space-between; + &.ai { + font-weight: bold; + text-align: right; + span { + margin: 0 20px 0 10px; + } + } - .io-buttons { - box-sizing: border-box; - width: 86px; - height: 40px; - border-radius: 40px; - background-color: #545454; + .do-container { + width: 130px; display: flex; flex-flow: row nowrap; + align-items: center; justify-content: space-between; - align-items: center; - padding: 3px; - } - button { - border: none; - background: @light-grey-blue; - color: #fff; - width: 34px; - height: 34px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 20px; - font-size: 18px; - font-weight: bold; - box-shadow: inset 0 2px 2px 0 rgba(0, 0, 0, 0.19); - - &.forced { - background: @clear-blue; - box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); + .io-buttons { + box-sizing: border-box; + width: 86px; + height: 40px; + border-radius: 40px; + background-color: #545454; + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: center; + padding: 3px; } - &.btn-force { - background: @scarlet; - box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); - width: 28px; - height: 28px; - margin: 3px; - } - } + button { + border: none; + background: @light-grey-blue; + color: #fff; + width: 34px; + height: 34px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 20px; + font-size: 18px; + font-weight: bold; + box-shadow: inset 0 2px 2px 0 rgba(0, 0, 0, 0.19); - input { - width: 84px; - height: 48px; - background-color: #dddddd; - box-shadow: inset 0 1px 3px 0 @black-50; - border: none; - box-sizing: border-box; - font-size: 18px; - font-weight: bold; - padding: 0 10px; - color: #4b4b4b; - text-align: right; + &.forced { + background: @clear-blue; + box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); + } + + &.btn-force { + background: @scarlet; + box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); + width: 28px; + height: 28px; + margin: 3px; + } + } + + input { + width: 84px; + height: 48px; + background-color: #dddddd; + box-shadow: inset 0 1px 3px 0 @black-50; + border: none; + box-sizing: border-box; + font-size: 18px; + font-weight: bold; + padding: 0 10px; + color: #4b4b4b; + text-align: right; + } } } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less index 93e93a32..9b5ab6d2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less @@ -1,30 +1,23 @@ @import "../../../variable.less"; +.main-container { + .button-details { + width: 93px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4) !important; + background-image: linear-gradient( + to bottom, + #818a8f 0%, + #42494e 98% + ) !important; + color: @very-light-pink !important; + } -.button-details { - width: 93px; - padding: 14px 0px 13px 0px; - display: flex; - justify-content: center; - align-items: center; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); - cursor: pointer; - > label { - font-size: 18px; - font-weight: 500; - color: @very-light-pink; - } -} - - - -.log-ciclo-automatico-table { - tbody tr:nth-child(odd) { - background-color: @fill-under-grey-3-2; - } - tbody tr:nth-child(even) { - background-color: @fill-under-grey-1-2; + .log-ciclo-automatico-table { + tbody tr:nth-child(odd) { + background-color: @fill-under-grey-3-2; + } + tbody tr:nth-child(even) { + background-color: @fill-under-grey-1-2; + } } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/tables/log-ciclo-automatico-table/log-ciclo-automatico-table.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/tables/log-ciclo-automatico-table/log-ciclo-automatico-table.less index 5d0300f8..9805750a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/tables/log-ciclo-automatico-table/log-ciclo-automatico-table.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/tables/log-ciclo-automatico-table/log-ciclo-automatico-table.less @@ -1,30 +1,26 @@ @import "../../../../variable.less"; -.date { +.main-container { + .date { width: 212px; -} -.message { + } + .message { width: 751px; -} + } -th, -td { - &.ciclo-date { - width: 212px; - max-width: 212px; - } - &.ciclo-message { - width: 751px; - max-width: 751px; - } - &.ciclo-recipe { - width: 171px; - max-width: 171px; + th, + td { + &.ciclo-date { + width: 212px; + max-width: 212px; + } + &.ciclo-message { + width: 751px; + max-width: 751px; + } + &.ciclo-recipe { + width: 171px; + max-width: 171px; + } } } - - - - - - diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.less index 08251285..ca73af18 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.less @@ -1,21 +1,23 @@ @import "../../../../variable.less"; -th, -td { - &.misurazioni-value { - width: 322px; - max-width: 322px; - } - &.misurazioni-recipe { - width: 539px; - max-width: 539px; - } - &.misurazioni-date { - width: 313px; - max-width: 313px; - } - &.misurazioni-type { - width: 187px; - max-width: 187px; +.main-container { + th, + td { + &.misurazioni-value { + width: 322px; + max-width: 322px; + } + &.misurazioni-recipe { + width: 539px; + max-width: 539px; + } + &.misurazioni-date { + width: 313px; + max-width: 313px; + } + &.misurazioni-type { + width: 187px; + max-width: 187px; + } } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.less index 60dc3d7e..4617beb3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.less @@ -1,73 +1,89 @@ @import "../../../../variable.less"; - -th, -td { - &.riscaldi-status { - width: 435px; - max-width: 435px; - padding: 0 0 0 38px; - } - &.riscaldi-set { - width: 378px; - max-width: 378px; - } - &.riscaldi-cell-id { - width: 254px; - max-width: 254px; - } - &.riscaldi-current { - width: 308px; - max-width: 308px; - } -} - -.status-buttons { - padding: 3px 16px; - border-radius: 2px; -} - .main-container { - label { - margin: 3px 16px 3px 16px; + th, + td { + &.riscaldi-set { + width: 10%; + max-width: 10%; + } + &.riscaldi-cell-id { + width: 10%; + max-width: 10%; + } + &.channel-id { + width: 10%; + max-width: 10%; + } + &.board-id { + width: 10%; + max-width: 10%; + } + &.output-id { + width: 10%; + max-width: 10%; + } + &.reflector-id { + width: 10%; + max-width: 10%; + } + &.riscaldi-current { + width: 10%; + max-width: 10%; + } + &.riscaldi-status { + width: 20%; + max-width: 20%; + } + &.riscaldi-details { + width: 10%; + max-width: 10%; + } + } + td { + > span { + padding: 0 10px; + } + } + + .status-td { + display: flex; + flex-flow: row; + justify-content: flex-start; + align-items: center; + } + .details-td { + display: flex; + flex-flow: row; + justify-content: flex-end; + align-items: center; + padding: 0; + } + + .status-buttons { + width: 80px; + padding: 3px 3px; + border-radius: 2px; + text-shadow: 0 0 4px rgba(0, 0, 0, 0.5); + color: #e8e8e8; + text-align: center; + } + + .main-container { + label { + margin: 3px 16px 3px 16px; + } + } + + .ok-button { + background-color: @booger; + } + + .broken-button { + background-color: @scarlet; + } + + .status-container { + display: flex; + justify-content: center; } } - -.ok-button { - background-color: @booger; - > label { - text-shadow: 0 0 4px @black-50; - color: @very-light-pink; - } -} - -.broken-button { - background-color: @scarlet; - > label { - text-shadow: 0 0 4px rgb(0 0 0 / 50%); - font-size: 16px; - color: @very-light-pink; - } -} - -.error-button { - background-color: @scarlet; - > label { - text-shadow: 0 0 4px @black-50; - color: @very-light-pink; - } -} - -.warning-button { - background-color: @macaroni-and-cheese; - > label { - margin: 3px 0px 3px 0px; - text-shadow: 0 0 4px @black-50; - color: @very-light-pink; - } -} - -.status-container { - width: 126px; - display: flex; - justify-content: center; -} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts index 7166631a..5ef40da9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts @@ -1,42 +1,28 @@ import { Component, Vue } from "vue-property-decorator"; +import { store } from "@/store"; @Component({}) export default class RiscaldiTable extends Vue { rowData = []; typeStatusButton: string; + + get resistances() { + return store.state.warmers.resistances; + } + + getChannelInfo(id) { + return store.state.warmers.channels.filter(i => i.idChannel == id)[0]; + } + + getBoard(id) { + return Math.floor((id-1)/16); + } + + getOutput(id) { + return Math.floor((id-1)%16); + } + mounted() { - this.rowData = [ - { - cellId: "1", - current: "0.06 A", - set: "8%", - status: "broken" - }, - { - cellId: "1", - current: "0.06 A", - set: "8%", - status: "ok" - }, - { - cellId: "1", - current: "0.06 A", - set: "8%", - status: "error 23" - }, - { - cellId: "1", - current: "0.06 A", - set: "8%", - status: "error 12" - }, - { - cellId: "1", - current: "0.06 A", - set: "8%", - status: "warning 3" - } - ]; } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.vue index 3f1e3c5b..9cf0879b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.vue @@ -3,75 +3,48 @@ - - - + + + + + + + - + - - - - - + + + + + + + + - + +
Cell IDCurrentSetCellReflectorChannelBoardOutputCurrent [A]Current [%] Status 
- - {{ item.cellId }} - - - - {{ item.current }} - - - - {{ item.set }} - - - - - +
{{item.idGroup}}{{item.idReflector}}{{item.idChannel}}{{getBoard(item.idChannel)}}{{getOutput(item.idChannel)}}{{getChannelInfo(item.idChannel).actualCurrent}} A{{getChannelInfo(item.idChannel).actualPerc}} % + + + + {{getChannelInfo(item.idChannel).channelStatus}} + - - - - - + + + {{getChannelInfo(item.idChannel).channelStatus}} - - - - - - - - - - - - - - Details + + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less index 0d75fcae..f4f428bb 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less @@ -47,7 +47,6 @@ td { height: 64px; - width: 64px; color: #e8e8e8; } @@ -76,79 +75,79 @@ } } } -} -.table-container { - height: 700px; + .table-container { + height: 700px; - tr.group-row { - height: 64px; - width: 100%; - background: transparent !important; - td { + tr.group-row { + height: 64px; + width: 100%; + background: transparent !important; + td { + text-align: center; + padding: 20px; + height: auto; + font-size: 16px; + color: #fff; + font-weight: bold; + text-transform: uppercase; + } + } + + td.pointer { text-align: center; - padding: 20px; - height: auto; - font-size: 16px; - color: #fff; - font-weight: bold; - text-transform: uppercase; + } + + button.pointer { + width: 48px; + height: 48px; + // padding: 6px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); + border: none; } } - td.pointer { - text-align: center; + .column-menu { + grid-row: 2; + border-top: @white 2px solid; } - button.pointer { - width: 48px; - height: 48px; - // padding: 6px; - object-fit: contain; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); - border: none; + .column-page { + grid-row: 2; + grid-column: 2; + width: 1424px; + height: 885px; + border-top: @white 2px solid; + background-color: @fill-under-grey-2-2; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(600px, 1fr)); } -} -.column-menu { - grid-row: 2; - border-top: @white 2px solid; -} + .column-page-one-column { + grid-row: 2; + grid-column: 2; + width: 1384px; + height: 885px; + border-top: @white 2px solid; + background-color: @fill-under-grey-2-2; + display: grid; + > table { + margin: 20px 0 0 20px; + } + } -.column-page { - grid-row: 2; - grid-column: 2; - width: 1424px; - height: 885px; - border-top: @white 2px solid; - background-color: @fill-under-grey-2-2; - display: grid; - grid-template-columns: repeat(auto-fill, minmax(600px, 1fr)); -} - -.column-page-one-column { - grid-row: 2; - grid-column: 2; - width: 1384px; - height: 885px; - border-top: @white 2px solid; - background-color: @fill-under-grey-2-2; - display: grid; - > table { + .one-column-table-container { + height: 750px; margin: 20px 0 0 20px; + > table { + width: -webkit-fill-available; + } + } + + .pointer { + cursor: pointer; } } - -.one-column-table-container { - height: 750px; - margin: 20px 0 0 20px; - > table { - width: -webkit-fill-available; - } -} - -.pointer { - cursor: pointer; -}