[fix] mobile css

This commit is contained in:
Rushabh Mehta 2016-03-29 10:49:27 +05:30
parent f842385611
commit 56616a0fb0
3 changed files with 39 additions and 31 deletions

View file

@ -1,36 +1,40 @@
<div class="row message-row small">
<div class="col-sm-9">
<div class="media">
{% if (data.is_public) { %}
<span class="pull-left" title="{{ __("Public") }}"><i class="octicon octicon-rss text-muted" style="margin-top: 3px;"></i></span>
{% } else { %}
<span class="pull-left" style="width: 20px; height: 16px; display: inline-block;"></span>
{% } %}
<div class="col-sm-9">
<div class="media">
{% if (data.is_public) { %}
<span class="pull-left hidden-xs" title="{{ __("Public") }}">
<i class="octicon octicon-rss text-muted" style="margin-top: 3px;"></i></span>
{% } else { %}
<span class="pull-left hidden-xs"
style="width: 20px; height: 16px; display: inline-block;"></span>
{% } %}
<div class="pull-left hidden-xs">
{% if (data.communication_type==="Bot") { %}
<span class="octicon octicon-zap bot-icon"></span>
{% } else { %}
<span class="avatar avatar-small" title="{%= frappe.user.full_name(data.owner) %} ">
<img class="media-object {{ data.is_system_message ? "grayscale" : "" }}"
<span class="avatar avatar-small" title="{%= frappe.user.full_name(data.owner) %} ">
<img class="media-object {{ data.is_system_message ? "grayscale" : "" }}"
src="{%= frappe.user.image(data.owner) %}">
</span>
</span>
{% } %}
</div>
<div class="media-body {{ data.is_system_message ? "text-muted" : "" }} message-bubble {{ data.is_mine ? "my-message" : "" }}">
{%= data.content %}
</div>
</div>
</div>
<div class="col-sm-3 text-right message-row-right">
<div class="text-muted">
<span class="hidden-sm hidden-md hidden-lg">{%= frappe.user.full_name(data.owner) %}, </span>
<div class="media-body {{ data.is_system_message ? "text-muted" : "" }} message-bubble {{ data.is_mine ? "my-message" : "" }}">
{%= data.content %}
</div>
</div>
</div>
<div class="col-sm-3 text-right message-row-right">
<div class="text-muted">
<span class="hidden-sm hidden-md hidden-lg">
{%= data.communication_type==="Bot" ? "Bot" : frappe.user.full_name(data.owner) %},
</span>
{%= comment_when(data.modified) %}
</div>
{% if (data.owner==user) { %}
<div>
<a class="delete text-extra-muted" data-name="{%= data.name %}"
onclick="frappe.desk.pages.messages.delete(this)">Delete</a>
</div>
{% } %}
</div>
{% if (data.owner==user) { %}
<div>
<a class="delete text-extra-muted" data-name="{%= data.name %}"
onclick="frappe.desk.pages.messages.delete(this)">Delete</a>
</div>
{% } %}
</div>
</div>

View file

@ -18,9 +18,11 @@
max-width: 50%;
vertical-align: middle;
}
.page-body {
overflow-x: hidden;
min-height: calc(60vh);
@media (min-width: 767px) {
.page-body {
overflow-x: hidden;
min-height: calc(60vh);
}
}
.page-title h6 {
margin-top: -8px;

View file

@ -24,9 +24,11 @@
vertical-align: middle;
}
.page-body {
overflow-x: hidden;
min-height: calc(100vh - 40px);
@media(min-width: @screen-xs) {
.page-body {
overflow-x: hidden;
min-height: calc(100vh - 40px);
}
}
.page-title {