From a6cabe7f046c705dee374eae6ae7cd8a4927e012 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 11 Nov 2020 17:05:49 +0530 Subject: [PATCH] fix: report view last row border - remove commented out code --- .../js/frappe/views/reports/report_view.js | 1 + frappe/public/scss/desk/frappe-datatable.scss | 123 +----------------- 2 files changed, 8 insertions(+), 116 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 4b386a4a66..cdf5f5602b 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -48,6 +48,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { setup_view() { this.setup_columns(); super.setup_new_doc_event(); + this.page.main.addClass('report-view'); } toggle_side_bar() { diff --git a/frappe/public/scss/desk/frappe-datatable.scss b/frappe/public/scss/desk/frappe-datatable.scss index 622e0f609e..c538b08288 100644 --- a/frappe/public/scss/desk/frappe-datatable.scss +++ b/frappe/public/scss/desk/frappe-datatable.scss @@ -129,7 +129,13 @@ table td.dt-cell { position: relative; } - +.report-view { + .dt-row:last-child:not(.dt-row-filter) { + .dt-cell { + border-bottom: 1px solid var(--border-color); + } + } +} .report-action-checkbox { margin: 0; @@ -144,8 +150,6 @@ table td.dt-cell { } } - - @keyframes breathe { 0% { background-color: transparent; @@ -157,116 +161,3 @@ table td.dt-cell { background-color: transparent; } } - - - -// @import "variables.less"; - -// .datatable { -// margin-left: -1px; -// margin-top: -1px; -// font-size: @text-medium; - -// .frappe-control, .form-control { -// margin: 0; -// border-radius: 0px; -// border: none; -// background-color: transparent; -// } - -// .form-group { -// margin: 0; -// } - -// .link-btn { -// top: 6px; -// } - -// select { -// height: 27px; -// } - -// .checkbox { -// margin: 7px 0 7px 8px; -// } - -// [data-fieldtype="Color"] .control-input { -// overflow: hidden; -// } -// } - -// .dt-scrollable { -// max-height: calc(100vh - 250px); -// min-height: 100px; -// scrollbar-width: thin; -// } - -// table td.dt-cell { -// position: relative; -// } - -// .dt-cell__edit { -// padding: 0; - -// input { -// font-size: inherit; -// height: 27px; -// } -// } - -// .dt-header { -// --dt-header-cell-bg: @panel-bg; -// --dt-cell-bg: @panel-bg; -// --dt-text-color: @text-muted; - -// .dt-row[data-is-filter] { -// display: flex !important; -// } -// } - -// .dt-row { -// height: 35px; -// } - -// .dt-row.dt-row-totalRow { -// font-weight: bold; -// } - -// .dt-row.row-update { -// animation: 500ms breathe forwards; -// } - -// .report-action-checkbox { -// margin: 0; -// margin-left: 10px; - -// .checkbox { -// margin: 0; -// } - -// .help-box { -// display: none; -// } -// } - -// .dt-filter { -// border: 1px solid @light-border-color; -// border-radius: 3px; -// background-color: #fff; -// } - -// .dt-tree-node__toggle + a { -// margin-left: 4px; -// } - -// @keyframes breathe { -// 0% { -// background-color: transparent; -// } -// 50% { -// background-color: @extra-light-yellow; -// } -// 100% { -// background-color: transparent; -// } -// }