+ {% if (is_different) { %}
+
{%= data.name %}
- {% } %}
+ {% } %}
{% } %}
-
-
{%= indicator_dot %}
-
- {%= frappe.render_template("item_assigned_to_comment_count", { data: data }) %}
+
+
+ {%= frappe.render_template("item_assigned_to_comment_count", { data: data }) %}
+
+
+ {%= indicator_dot %}
diff --git a/frappe/public/js/frappe/list/list_item_row_1.html b/frappe/public/js/frappe/list/list_item_row_1.html
deleted file mode 100644
index c0806249d1..0000000000
--- a/frappe/public/js/frappe/list/list_item_row_1.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
- {%= main %}
-
-
- {% if (meta.title_field && !settings.hide_name_column) {
- var is_different = data.name !== data[meta.title_field];
- %}
-
- {% if (is_different) { %}
-
- {%= data.name %}
- {% } %}
-
- {% } %}
-
-
-
-
{%= indicator_dot %}
-
- {%= frappe.render_template("item_assigned_to_comment_count", { data: data }) %}
-
-
diff --git a/frappe/public/js/frappe/list/list_item_row_head.html b/frappe/public/js/frappe/list/list_item_row_head.html
index 0d59acb354..e0679a9c6c 100644
--- a/frappe/public/js/frappe/list/list_item_row_head.html
+++ b/frappe/public/js/frappe/list/list_item_row_head.html
@@ -1,11 +1,11 @@
-
+
{%= main %}
{% if(!list.settings.hide_name_column) { %}
-
+
{% } %}
-
+
diff --git a/frappe/public/js/frappe/list/list_item_subject.html b/frappe/public/js/frappe/list/list_item_subject.html
index 7293e8836e..2e9a5c04dc 100644
--- a/frappe/public/js/frappe/list/list_item_subject.html
+++ b/frappe/public/js/frappe/list/list_item_subject.html
@@ -1,5 +1,5 @@
{% if (_checkbox) { %}
-
+
{% } %}
0) {
diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js
index 7d5d234b16..207d43adaa 100644
--- a/frappe/public/js/frappe/views/gantt/gantt_view.js
+++ b/frappe/public/js/frappe/views/gantt/gantt_view.js
@@ -107,7 +107,7 @@ frappe.views.GanttView = frappe.views.ListRenderer.extend({
var $dropdown = $(dropdown)
$dropdown.find(".dropdown-menu")
.append(dropdown_list);
- me.list_view.$page.find(`.list-row-head[data-list-renderer='Gantt'] .list-row-right`).css("margin-top", 0).html($dropdown)
+ me.list_view.$page.find(`[data-list-renderer='Gantt'] .list-row-right`).css("margin-right", "15px").html($dropdown)
$dropdown.on("click", ".option", function() {
var mode = $(this).data('value');
me.gantt.change_view_mode(mode);
diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index 4ea3c9b07e..e3211a8f6f 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -341,7 +341,9 @@ frappe.provide("frappe.views");
function setup_restore_columns() {
var cur_list = store.getState().cur_list;
var columns = store.getState().columns;
- var list_row_right = cur_list.$page.find(`.list-row-head[data-list-renderer='Kanban'] .list-row-right`);
+ var list_row_right =
+ cur_list.$page.find(`[data-list-renderer='Kanban'] .list-row-right`)
+ .css('margin-right', '15px');
list_row_right.empty();
var archived_columns = columns.filter(function (col) {
@@ -364,7 +366,7 @@ frappe.provide("frappe.views");
"" +
" ")
- list_row_right.css("margin-top", 0).html($dropdown);
+ list_row_right.html($dropdown);
$dropdown.find(".dropdown-menu").on("click", "button.restore-column", function (e) {
var column_title = $(this).data().column;
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 4826b8c2bd..c1becd9c3f 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -483,7 +483,6 @@
.list-items {
width: 100%;
- font-size: @text-medium;
}
.list-item-container {
@@ -501,8 +500,17 @@
height: 40px;
padding-left: 15px;
+ font-size: @text-medium;
+
+ @media (max-width: @screen-xs) {
+ height: 50px;
+ padding-left: 10px;
- &__head {
+ font-size: @text-regular;
+ font-weight: normal;
+ }
+
+ &--head {
background-color: @panel-bg;
border-bottom: 1px solid @border-color;
}
@@ -519,15 +527,36 @@
}
}
-.list-item--content {
+.list-item__content {
flex: 1;
margin-right: 15px;
- &__flex-2 {
+ display: flex;
+ align-items: center;
+
+ &--flex-2 {
flex: 2;
}
- &:last-child {
+ &--activity {
+ justify-content: flex-end;
margin-right: 5px;
+
+ .list-row-modified, .avatar-small {
+ margin-right: 10px;
+ }
+ }
+
+ &--indicator span::before {
+ height: 12px;
+ width: 12px;
}
+
+ &--id {
+ justify-content: flex-end;
+ }
+}
+
+.frappe-timestamp {
+ white-space: nowrap;
}
\ No newline at end of file