浏览代码

[fix] item selector

version-14
Rushabh Mehta 7 年前
父节点
当前提交
82c9357b50
共有 6 个文件被更改,包括 42 次插入4 次删除
  1. +16
    -0
      frappe/public/css/list.css
  2. +1
    -1
      frappe/public/js/frappe/assets.js
  3. +1
    -1
      frappe/public/js/frappe/form/grid.js
  4. +3
    -1
      frappe/public/js/frappe/form/templates/grid_body.html
  5. +1
    -1
      frappe/public/js/frappe/ui/toolbar/search_utils.js
  6. +20
    -0
      frappe/public/less/list.less

+ 16
- 0
frappe/public/css/list.css 查看文件

@@ -288,6 +288,10 @@
display: flex;
flex-wrap: wrap;
}
.image-view-container .image-view-row {
display: flex;
border-bottom: 1px solid #ebeff2;
}
.image-view-container .image-view-item {
flex: 0 0 25%;
padding: 15px;
@@ -360,6 +364,18 @@
border-bottom: 1px solid #EBEFF2;
}
}
.item-selector {
border: 1px solid #d1d8dd;
}
.item-selector .image-view-row {
width: 100%;
}
.item-selector .image-field {
height: 120px;
}
.item-selector .placeholder-text {
font-size: 48px;
}
.image-view-container.three-column .image-view-item {
flex: 0 0 33.33333333%;
}


+ 1
- 1
frappe/public/js/frappe/assets.js 查看文件

@@ -85,7 +85,7 @@ frappe.assets = {
frappe.assets.executed_.push(path)
}
}
callback();
callback && callback();
},

// check if the asset exists in


+ 1
- 1
frappe/public/js/frappe/form/grid.js 查看文件

@@ -653,7 +653,7 @@ frappe.ui.form.Grid = Class.extend({
var btn = this.custom_buttons[label];
if(!btn) {
btn = $('<button class="btn btn-default btn-xs btn-custom">' + label + '</button>')
.css('margin-right', '10px')
.css('margin-right', '4px')
.prependTo(this.grid_buttons)
.on('click', click);
this.custom_buttons[label] = btn;


+ 3
- 1
frappe/public/js/frappe/form/templates/grid_body.html 查看文件

@@ -7,7 +7,9 @@
<div class="small form-clickable-section grid-footer">
<div class="row">
<div class="col-sm-6 grid-buttons">
<button type="reset" class="btn btn-xs btn-danger grid-remove-rows hide">
<button type="reset"
class="btn btn-xs btn-danger grid-remove-rows hide"
style="margin-right: 4px;">
{%= __("Delete") %}</button>
<button type="reset"
class="grid-add-multiple-rows btn btn-xs btn-default hide"


+ 1
- 1
frappe/public/js/frappe/ui/toolbar/search_utils.js 查看文件

@@ -51,7 +51,7 @@ frappe.search.utils = {
var out = {
route: match[1]
}
if(match[1][0]==='Form') {
if(match[1][0]==='Form' && match[1][2]) {
if(match[1][1] !== match[1][2]) {
out.label = __(match[1][1]) + " " + match[1][2].bold();
out.value = __(match[1][1]) + " " + match[1][2];


+ 20
- 0
frappe/public/less/list.less 查看文件

@@ -361,6 +361,11 @@
display: flex;
flex-wrap: wrap;

.image-view-row {
display: flex;
border-bottom: 1px solid #ebeff2;
}

.image-view-item {
flex: 0 0 100%/4;
padding: 15px;
@@ -431,6 +436,21 @@
}
}

.item-selector {
border: 1px solid @border-color;

.image-view-row {
width: 100%;
}
.image-field {
height: 120px;
}

.placeholder-text {
font-size: 48px;
}
}

.image-view-container.three-column {
.image-view-item {
flex: 0 0 100%/3;


正在加载...
取消
保存