From 0118fe4dee96bd33a73ef79f3da8bef8d858c514 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 26 Aug 2013 10:39:25 +0530 Subject: [PATCH] [minor] [style] [avatar] --- public/css/common.css | 23 ++++++++++------------- public/js/wn/ui/appframe.js | 4 ++-- public/js/wn/views/listview.js | 13 +++++++++---- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/public/css/common.css b/public/css/common.css index 040bb097d8..9278654283 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -328,13 +328,13 @@ div#freeze { .avatar { display: inline-block; vertical-align: middle; + border-radius: 50%; overflow: hidden; + background-color: #ddd; + border: 1px solid #eee; } .avatar img { - background-color: #ddd; - border: 1px solid #eee; - border-radius: 50%; width: 100%; height: auto; } @@ -342,19 +342,13 @@ div#freeze { .avatar-small { margin-right: 5px; width: 30px; -} - -.avatar-small img { - max-height: 30px; + height: 30px; } .avatar-large { margin-right: 10px; width: 72px; -} - -.avatar-large img { - max-height: 72px; + height: 30px; } /* slickgrid */ @@ -457,14 +451,17 @@ textarea[data-fieldtype="Small Text"] { display: inline; } -.hidden-sm-inline { +.hidden-xs-inline, .hidden-xs-inline-block { display: none; } @media (min-width: 768px) { - .hidden-sm-inline { + .hidden-xs-inline { display: inline; } + .hidden-xs-inline-block { + display: inline-block; + } } .modal-backdrop { diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js index a21e6ea127..297617d959 100644 --- a/public/js/wn/ui/appframe.js +++ b/public/js/wn/ui/appframe.js @@ -23,7 +23,7 @@ wn.ui.AppFrame = Class.extend({
\ \ \ - \ + \ \
').prependTo(parent); @@ -212,7 +212,7 @@ wn.ui.AppFrame = Class.extend({ var append_or_prepend = is_title ? "prependTo" : "appendTo"; this.buttons[label] = $(repl('', args)) + %(icon)s %(label)s', args)) [append_or_prepend](this.toolbar.find(".btn-group").css({"margin-right": "5px"})) .attr("title", wn._(label)) .click(click); diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index 4723851163..aca2e8d52d 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -159,16 +159,20 @@ wn.views.ListView = Class.extend({ // row #2 var row2 = $('
\
\ -
\ -
\ -
\ +
\ +
\ + \ +
\ +
\ +
\
\
\
').appendTo(row); // modified row2.find(".timestamp").html(comment_when(data.modified)); + row2.find(".list-last-modified").html(wn._("Last updated by") + ": " + wn.user_info(data.modified_by).fullname); // add tags var tag_editor = new wn.ui.TagEditor({ @@ -241,6 +245,7 @@ wn.views.ListView = Class.extend({ + wn.user_info(data.modified_by).fullname)) .appendTo($(parent).css({"margin-top": "-5px"})) .css({"max-width": "100%"}) + .addClass("hidden-xs-inline-block") } else if(opts.content=='check') { }