浏览代码

[minor] style and fixes

version-14
Rushabh Mehta 10 年前
父节点
当前提交
7a41cea685
共有 5 个文件被更改,包括 15 次插入10 次删除
  1. +1
    -0
      frappe/public/css/desk.css
  2. +4
    -2
      frappe/public/js/frappe/form/form_sidebar.html
  3. +5
    -5
      frappe/public/js/frappe/list/list_sidebar.js
  4. +4
    -3
      frappe/public/js/frappe/views/container.js
  5. +1
    -0
      frappe/public/less/desk.less

+ 1
- 0
frappe/public/css/desk.css 查看文件

@@ -359,6 +359,7 @@ em.link-option {
.sidebar-section h6 { .sidebar-section h6 {
text-transform: uppercase; text-transform: uppercase;
color: #8d99a6; color: #8d99a6;
font-size: 10px;
} }
.sidebar-section h6 .label { .sidebar-section h6 .label {
font-size: 12px; font-size: 12px;


+ 4
- 2
frappe/public/js/frappe/form/form_sidebar.html 查看文件

@@ -19,7 +19,8 @@
</h6> </h6>
<div class="assign-list"></div> <div class="assign-list"></div>
<div> <div>
<a class="text-muted h6 add-assignment">{%= __("Assign") %}</a>
<a class="grey h6 add-assignment">{%= __("Assign") %}
<span class="octicon octicon-plus h6"></span></a>
</div> </div>
</div> </div>
<div class="sidebar-section form-attachments"> <div class="sidebar-section form-attachments">
@@ -28,7 +29,8 @@
</h6> </h6>
<div class="attachment-list"></div> <div class="attachment-list"></div>
<div> <div>
<a class="text-muted h6 add-attachment">{%= __("Add Attachment") %}</a>
<a class="grey h6 add-attachment">{%= __("Attach a file") %}
<span class="octicon octicon-plus h6"></span></a>


<br><span class="small text-muted"> <br><span class="small text-muted">
{%= __("Drag and drop to attach") %}</span> {%= __("Drag and drop to attach") %}</span>


+ 5
- 5
frappe/public/js/frappe/list/list_sidebar.js 查看文件

@@ -47,14 +47,14 @@ frappe.views.ListSidebar = Class.extend({
}, },
render_stat: function(field, stat) { render_stat: function(field, stat) {
var me = this; var me = this;
var show_tags = '<a class="list-tag-preview small" style="margin-left: 7px;">'
+ '<span class="small">' + __("Edit") +'</span></a>';
var show_tags = '<a class="list-tag-preview" style="margin-left: 7px;">'
+ '<span class="octicon octicon-pencil" style="font-size: 12px;"></span></a>';


if(!stat || !stat.length) { if(!stat || !stat.length) {
if(field==='_user_tags') { if(field==='_user_tags') {
$('<div class="sidebar-section">\ $('<div class="sidebar-section">\
<h5 class="text-muted">\
</i> '+__('Tags')+show_tags+'</h5>\
<h6>\
</i> '+__('Tags')+show_tags+'</h6>\
<div class="side-panel-body">\ <div class="side-panel-body">\
<div class="text-muted small"><i>'+__('No records tagged.')+'</i><br>' <div class="text-muted small"><i>'+__('No records tagged.')+'</i><br>'
+'</div>\ +'</div>\
@@ -69,7 +69,7 @@ frappe.views.ListSidebar = Class.extend({


// grid // grid
var $w = $('<div class="sidebar-section">\ var $w = $('<div class="sidebar-section">\
<h5 class="text-muted">'+ __(label) +'</h5>\
<h6>'+ __(label) +'</h6>\
<div class="side-panel-body">\ <div class="side-panel-body">\
</div>\ </div>\
</div>'); </div>');


+ 4
- 3
frappe/public/js/frappe/views/container.js 查看文件

@@ -87,11 +87,12 @@ frappe.views.Container = Class.extend({
} }


if(breadcrumbs.module && breadcrumbs.module != "Desk") { if(breadcrumbs.module && breadcrumbs.module != "Desk") {
if(breadcrumbs.module==="Core") breadcrumbs.module = "Setup";
if(in_list(["Core", "Email", "Custom"], breadcrumbs.module))
breadcrumbs.module = "Setup";
divider(); divider();
var module_info = frappe.get_module(breadcrumbs.module), var module_info = frappe.get_module(breadcrumbs.module),
icon = module_info.icon,
label = module_info.label;
icon = module_info && module_info.icon,
label = module_info ? module_info.label : breadcrumbs.module;
if(icon) { if(icon) {
icon = '<span class="'+icon+' text-muted"></span> ' icon = '<span class="'+icon+' text-muted"></span> '
} }


+ 1
- 0
frappe/public/less/desk.less 查看文件

@@ -429,6 +429,7 @@ em.link-option {
.sidebar-section h6 { .sidebar-section h6 {
text-transform: uppercase; text-transform: uppercase;
color: @text-muted; color: @text-muted;
font-size: 10px;
} }


.sidebar-section h6 .label { .sidebar-section h6 .label {


正在加载...
取消
保存