* [mobile][fix] uploaded images not visible * [mobile][fix] overflow titleversion-14
@@ -48,7 +48,7 @@ | |||||
} | } | ||||
@media (max-width: 767px) { | @media (max-width: 767px) { | ||||
.navbar-desk { | .navbar-desk { | ||||
width: 40% !important; | |||||
width: 50% !important; | |||||
} | } | ||||
} | } | ||||
#search-modal .modal-dialog, | #search-modal .modal-dialog, | ||||
@@ -197,7 +197,7 @@ | |||||
display: inline-block; | display: inline-block; | ||||
} | } | ||||
.toggle-sidebar { | .toggle-sidebar { | ||||
margin-right: 15px; | |||||
margin-right: 10px; | |||||
} | } | ||||
.navbar-default .navbar-nav > li > a, | .navbar-default .navbar-nav > li > a, | ||||
.navbar-default .navbar-brand { | .navbar-default .navbar-brand { | ||||
@@ -69,6 +69,11 @@ body { | |||||
white-space: nowrap; | white-space: nowrap; | ||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
#navbar-breadcrumbs li a { | |||||
width: 100px; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
} | |||||
#navbar-breadcrumbs > li, | #navbar-breadcrumbs > li, | ||||
#navbar-breadcrumbs > li > a { | #navbar-breadcrumbs > li > a { | ||||
display: inline-block; | display: inline-block; | ||||
@@ -84,6 +89,7 @@ body { | |||||
} | } | ||||
.navbar-nav { | .navbar-nav { | ||||
margin: 0px; | margin: 0px; | ||||
margin-right: -15px; | |||||
} | } | ||||
.sidebar .form-group { | .sidebar .form-group { | ||||
margin-bottom: 0px; | margin-bottom: 0px; | ||||
@@ -48,7 +48,7 @@ | |||||
} | } | ||||
@media (max-width: 767px) { | @media (max-width: 767px) { | ||||
.navbar-desk { | .navbar-desk { | ||||
width: 40% !important; | |||||
width: 50% !important; | |||||
} | } | ||||
} | } | ||||
#search-modal .modal-dialog, | #search-modal .modal-dialog, | ||||
@@ -197,7 +197,7 @@ | |||||
display: inline-block; | display: inline-block; | ||||
} | } | ||||
.toggle-sidebar { | .toggle-sidebar { | ||||
margin-right: 15px; | |||||
margin-right: 10px; | |||||
} | } | ||||
.navbar-default .navbar-nav > li > a, | .navbar-default .navbar-nav > li > a, | ||||
.navbar-default .navbar-brand { | .navbar-default .navbar-brand { | ||||
@@ -47,7 +47,7 @@ | |||||
width: 46px; | width: 46px; | ||||
height: 0; | height: 0; | ||||
padding: 23px 0; | padding: 23px 0; | ||||
background-size: cover; | |||||
background-size: contain; | |||||
background-repeat: no-repeat; | background-repeat: no-repeat; | ||||
background-position: center center; | background-position: center center; | ||||
border-radius: 4px; | border-radius: 4px; | ||||
@@ -15,6 +15,9 @@ frappe.ui.form.set_user_image = function(frm) { | |||||
// if image field has value | // if image field has value | ||||
if (image) { | if (image) { | ||||
image = (window.cordova && image.indexOf('http')===-1) ? | |||||
frappe.base_url + image : image; | |||||
image_section | image_section | ||||
.find(".sidebar-image") | .find(".sidebar-image") | ||||
.css("background-image", 'url("' + image + '")') | .css("background-image", 'url("' + image + '")') | ||||
@@ -250,12 +250,15 @@ frappe.views.ListView = Class.extend({ | |||||
"Datetime", "Float", "Int", "Link", | "Datetime", "Float", "Int", "Link", | ||||
"Percent", "Select", "Read Only", "Time" | "Percent", "Select", "Read Only", "Time" | ||||
]; | ]; | ||||
var image_url = (data.image && window.cordova && data.image.indexOf('http')===-1) ? | |||||
frappe.base_url + data.image : data.image; | |||||
img_col = $(frappe.render_template("image_view_item_row", { | img_col = $(frappe.render_template("image_view_item_row", { | ||||
data: data, | data: data, | ||||
list: this, | list: this, | ||||
columns: this.columns, | columns: this.columns, | ||||
allowed_type: this.allowed_type, | allowed_type: this.allowed_type, | ||||
item_image: data.image ? "url('" + data.image + "')" : null, | |||||
item_image: image_url ? "url('" + image_url + "')" : null, | |||||
color: frappe.get_palette(data.item_name), | color: frappe.get_palette(data.item_name), | ||||
subject: this.get_avatar_and_id(data, true), | subject: this.get_avatar_and_id(data, true), | ||||
right_column: this.settings.right_column | right_column: this.settings.right_column | ||||
@@ -24,10 +24,14 @@ frappe.avatar = function(user, css_class, title) { | |||||
} | } | ||||
if(user_info.image) { | if(user_info.image) { | ||||
var image = (window.cordova && user_info.image.indexOf('http')===-1) ? | |||||
frappe.base_url + user_info.image : user_info.image; | |||||
return repl('<span class="avatar %(css_class)s" title="%(title)s">\ | return repl('<span class="avatar %(css_class)s" title="%(title)s">\ | ||||
<span class="avatar-frame" style="background-image: url(%(image)s)"\ | <span class="avatar-frame" style="background-image: url(%(image)s)"\ | ||||
title="%(title)s"></span></span>', { | title="%(title)s"></span></span>', { | ||||
image: user_info.image, | |||||
image: image, | |||||
title: title, | title: title, | ||||
abbr: user_info.abbr, | abbr: user_info.abbr, | ||||
css_class: css_class | css_class: css_class | ||||
@@ -92,6 +92,12 @@ body { | |||||
max-width: 150px; | max-width: 150px; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
overflow: hidden; | overflow: hidden; | ||||
a { | |||||
width: 100px; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
} | |||||
} | } | ||||
} | } | ||||
@@ -112,6 +118,7 @@ body { | |||||
.navbar-nav { | .navbar-nav { | ||||
margin: 0px; | margin: 0px; | ||||
margin-right: -15px; | |||||
} | } | ||||
.sidebar .form-group { | .sidebar .form-group { | ||||
@@ -59,7 +59,7 @@ | |||||
@media (max-width: 767px) { | @media (max-width: 767px) { | ||||
.navbar-desk { | .navbar-desk { | ||||
width: 40% !important; | |||||
width: 50% !important; | |||||
} | } | ||||
} | } | ||||
@@ -225,7 +225,7 @@ | |||||
} | } | ||||
.toggle-sidebar { | .toggle-sidebar { | ||||
margin-right: 15px; | |||||
margin-right: 10px; | |||||
} | } | ||||
.navbar-default .navbar-nav > li > a, | .navbar-default .navbar-nav > li > a, | ||||
@@ -58,7 +58,7 @@ | |||||
width: 46px; | width: 46px; | ||||
height: 0; | height: 0; | ||||
padding: 23px 0; | padding: 23px 0; | ||||
background-size: cover; | |||||
background-size: contain; | |||||
background-repeat: no-repeat; | background-repeat: no-repeat; | ||||
background-position: center center; | background-position: center center; | ||||
border-radius: 4px; | border-radius: 4px; | ||||