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

This commit is contained in:
Suraj Shetty 2020-09-01 09:42:54 +05:30
commit 378d1bf36d
7 changed files with 20 additions and 9 deletions

View file

@ -427,9 +427,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
"/assets/frappe/images/ui-states/list-empty-state.svg";
const new_button = this.can_create
? `<p><button class="btn btn-primary btn-sm btn-new-doc">
? `<p><button class="btn btn-primary btn-sm btn-new-doc hidden-xs">
${new_button_label}
</button></p>`
</button> <button class="btn btn-primary btn-new-doc visible-xs">${__('Create New')}</button></p>`
: "";
return `<div class="msg-box no-border">

View file

@ -157,7 +157,7 @@ frappe.ui.Page = Class.extend({
},
get_icon_label: function(icon, label) {
return `${icon ? frappe.utils.icon(icon, 'xs') : ''} <span> ${__(label)} </span>`;
return `${icon ? frappe.utils.icon(icon, 'xs') : ''} <span class="hidden-xs"> ${__(label)} </span>`;
},
set_action: function(btn, opts) {

View file

@ -56,6 +56,7 @@
p {
margin: 3px 0;
line-height: 1.4;
}
}
}

View file

@ -258,8 +258,12 @@
margin-bottom: 0;
}
.scroll-to-top {
position: absolute;
height: 28px;
right: 0;
.form-footer {
position: relative;
.scroll-to-top {
position: absolute;
height: 28px;
right: 0;
}
}

View file

@ -18,7 +18,7 @@ use.like-icon {
}
#icon-close {
fill: var(--icon-stroke);
fill: var(--gray-600);
}
.icon > .close-alt {

View file

@ -65,7 +65,7 @@ body.no-list-sidebar {
-webkit-transition: color 0.2s;
font-size: var(--text-md);
&:hover {
&:hover:not(.list-row-head) {
background-color: var(--highlight-color);
}
&:last-child {
@ -128,6 +128,7 @@ body.no-list-sidebar {
}
.list-row-head {
cursor: default;
.list-subject {
font-weight: normal;

View file

@ -98,6 +98,11 @@ $threshold: 40;
overflow: scroll;
max-height: 500px;
}
.actions > * {
color: var(--text-muted);
}
.action-btn {
padding-top: 0;
padding-bottom: 0;