From 6bd91580b8ce46ba18b4c79c9bc807973330c464 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 22 Mar 2017 15:44:31 +0530 Subject: [PATCH] ui fixes (#2880) * [ui] msgprint text overflow fix * fix render tags in list view * remove notify.js, tag-it.min.js from build.json --- frappe/public/build.json | 2 -- frappe/public/css/common.css | 3 +++ frappe/public/css/desk.css | 3 +++ frappe/public/css/website.css | 3 +++ frappe/public/js/frappe/list/list_renderer.js | 2 ++ frappe/public/less/common.less | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index f917970988..de78968af5 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -63,8 +63,6 @@ "public/js/lib/taggle/taggle.min.js", "public/js/lib/jquery/jquery.hotkeys.js", "public/js/lib/summernote/summernote.js", - "public/js/lib/notify.js", - "public/js/lib/tag-it.min.js", "public/js/lib/bootstrap.min.js", "public/js/lib/moment/moment-with-locales.min.js", "public/js/lib/moment/moment-timezone-with-data.min.js", diff --git a/frappe/public/css/common.css b/frappe/public/css/common.css index 0a1c5c09f2..e1883eed00 100644 --- a/frappe/public/css/common.css +++ b/frappe/public/css/common.css @@ -112,6 +112,9 @@ a.badge-hover:focus .badge, a.badge-hover:active .badge { background-color: #D8DFE5; } +.msgprint { + word-wrap: break-word; +} .msgprint pre { text-align: left; } diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 349c268839..0c3eda3276 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -112,6 +112,9 @@ a.badge-hover:focus .badge, a.badge-hover:active .badge { background-color: #D8DFE5; } +.msgprint { + word-wrap: break-word; +} .msgprint pre { text-align: left; } diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index 7a667e0c22..75941aab72 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -112,6 +112,9 @@ a.badge-hover:focus .badge, a.badge-hover:active .badge { background-color: #D8DFE5; } +.msgprint { + word-wrap: break-word; +} .msgprint pre { text-align: left; } diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index d0abe5d9bb..eec9ac3ea4 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -318,6 +318,8 @@ frappe.views.ListRenderer = Class.extend({ if (this.settings.post_render_item) { this.settings.post_render_item(this, element, data); } + + this.render_tags(element, data); }, // returns html for a data item, diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 490c718194..5c5238d30b 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -137,6 +137,7 @@ a.badge-hover& { .msgprint { // margin: 15px 0px; // text-align: center; + word-wrap: break-word; pre { text-align: left;