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

Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui

Browse source
This commit is contained in:
Suraj Shetty 2021-01-15 11:38:34 +05:30
commit d71f4d5d3a
11 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/page/setup_wizard/setup_wizard.js
View file

@ -88,8 +88,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
super(args);
$.extend(this, args);
this.welcomed = true;
this.page_name = "setup-wizard";
this.welcomed = true;
frappe.set_route("setup-wizard/0");
}

2
frappe/public/js/frappe/form/controls/link.js
View file

@ -182,7 +182,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
let filter_string = me.get_filter_description(args.filters);
if (filter_string) {
r.results.push({
html: `<span class="text-muted">${filter_string}</span>`,
html: `<span class="text-muted" style="line-height: 1.5">${filter_string}</span>`,
value: '',
action: () => {}
});

13
frappe/public/js/frappe/form/dashboard.js
View file

@ -602,7 +602,7 @@ class Section {
this.df = options || {};
this.make();
if (this.df.title && this.df.collapsible) {
if (this.df.title && this.df.collapsible && localStorage.getItem(options.css_class + '-closed')) {
this.collapse();
}
this.refresh();
@ -657,6 +657,7 @@ class Section {
this.collapse_link = this.head.on("click", () => {
this.collapse();
});
this.set_icon();
this.indicator.show();
}
}
@ -677,9 +678,15 @@ class Section {
this.body.toggleClass("hide", hide);
this.head && this.head.toggleClass("collapsed", hide);
let indicator_icon = hide ? 'down' : 'up-line';
this.set_icon(hide);
this.indicator & this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1'));
// save state for next reload ('' is falsy)
localStorage.setItem(this.df.css_class + '-closed', hide ? '1' : '');
}
set_icon(hide) {
let indicator_icon = hide ? 'down' : 'up-line';
this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1'));
}
is_collapsed() {

7
frappe/public/js/frappe/form/grid.js
View file

@ -201,7 +201,7 @@ export default class Grid {
this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
if (selected_children.length == this.grid_pagination.page_length) {
frappe.utils.scroll_to(this.wrapper);
this.scroll_to_top();
}
}
@ -213,9 +213,12 @@ export default class Grid {
this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
this.refresh();
frappe.utils.scroll_to(this.wrapper);
this.scroll_to_top();
});
}
scroll_to_top() {
frappe.utils.scroll_to(this.wrapper);
}
select_row(name) {

1
frappe/public/js/frappe/form/grid_pagination.js
View file

@ -108,6 +108,7 @@ export default class GridPagination {
}
this.update_page_numbers();
this.grid.scroll_to_top();
}
go_to_last_page_to_add_row() {

1
frappe/public/js/frappe/ui/slides.js
View file

@ -242,6 +242,7 @@ frappe.ui.Slides = class Slides {
this.done_state = done_state;
this.before_load = before_load;
this.on_update = on_update;
this.page_name = "setup-wizard";
this.slide_dict = {};

2
frappe/public/js/frappe/utils/utils.js
View file

@ -281,7 +281,7 @@ Object.assign(frappe.utils, {
},
get_scroll_position: function(element, additional_offset) {
let header_offset = $(".navbar").height() + $(".page-head").height();
let header_offset = $(".navbar").height() + $(".page-head:visible").height();
let scroll_top = $(element).offset().top - header_offset - cint(additional_offset);
return scroll_top;
},

2
frappe/public/scss/desk/form.scss
View file

@ -24,7 +24,7 @@
color: $text-muted;
margin-left: 10px;
position: relative;
bottom: -1px;
padding: 0px;
}
.collapse-indicator.octicon-chevron-up {

1
frappe/public/scss/desk/grid.scss
View file

@ -370,6 +370,7 @@
background-color: var(--fg-color);
.btn {
box-shadow: none;
margin-top: -3px;
}
}

11
frappe/public/scss/login.scss
View file

@ -1,13 +1,8 @@
@import "./desk/variables";
// [data-path="login"] {
// background-color: var(--bg-color);
// .web-footer,
// .navbar {
// background-color: var(--fg-color);
// }
// }
body {
background-color: var(--bg-light-gray);
}
.for-login,
.for-forgot,

2
frappe/templates/base.html
View file

@ -58,7 +58,7 @@
window.socketio_port = {{ (frappe.socketio_port or 'null') }};
</script>
</head>
<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="bg-light {{ body_class or ''}}">
<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="{{ body_class or ''}}">
{%- block banner -%}
{% include "templates/includes/banner_extension.html" ignore missing %}