vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #14451 from shariquerik/revert-single-scrollbar-pr

Browse source 
revert: Reverting single vertical scrollbar fix
This commit is contained in:
mergify[bot] 2021-10-21 07:48:03 +00:00 • committed by GitHub
commit d54c6e6d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -517,9 +517,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
} else {
this.page.show_form();
}
this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height'));
this.page.body.parent().css('margin-bottom', 'unset');
}
set_filters(filters) {
@ -834,7 +831,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (this.raw_data.add_total_row) {
data = data.slice();
data.splice(-1, 1);
this.$page.find('.layout-main-section')[0].style.setProperty('--report-total-height', '310px');
}
this.$report.show();

2
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -50,8 +50,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
this.setup_columns();
super.setup_new_doc_event();
this.page.main.addClass('report-view');
this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height'));
this.page.body.parent().css('margin-bottom', 'unset');
}
toggle_side_bar() {

22
frappe/public/scss/desk/report.scss
View file

@ -84,39 +84,17 @@
margin-bottom: 10px;
}
.layout-main-section {
--report-filter-height: 0px;
--report-total-height: 275px;
}
.report-wrapper {
overflow: auto;
.datatable {
height: calc(100vh - var(--report-filter-height) - 205px);
.dt-scrollable {
height: calc(100vh - var(--report-filter-height) - var(--report-total-height));
}
}
}
.report-view {
.result {
min-height: 50vh !important;
.dt-row:last-child:not(.dt-row-filter) {
.dt-cell {
border-bottom: 1px solid var(--border-color);
}
}
.datatable {
height: calc(100vh - var(--report-filter-height) - 225px);
.dt-scrollable {
height: calc(100vh - var(--report-filter-height) - 295px);
}
}
}
}