Skip to content

Commit

Permalink
frontend: Change main UI content to not be background images.
Browse files Browse the repository at this point in the history
  • Loading branch information
vaidap authored and timabbott committed Jul 11, 2017
1 parent b2f105a commit 74ab5b6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
16 changes: 11 additions & 5 deletions static/styles/zulip.css
Original file line number Diff line number Diff line change
Expand Up @@ -1495,9 +1495,9 @@ blockquote p {
width: 35px;
height: 35px;
margin-right: 11px;
background-size: 35px 35px;
vertical-align: top;
border-radius: 4px;
overflow: hidden;
}

.home-error-bar {
Expand Down Expand Up @@ -1806,10 +1806,7 @@ nav .column-left .nav-logo {
margin-top: 8px;
width: 25px;
height: 25px;
background-image: url(../images/logo/zulip-icon-128x128.png);
background-size: 100% 100%;
background-repeat: no-repeat;
background-position: center center;

}

nav .column-left .company-name {
Expand Down Expand Up @@ -2697,3 +2694,12 @@ img.emoji {
margin-top: 10px;
}
}

.no-drag {
user-drag: none;
user-select: none;
-moz-user-select: none;
-webkit-user-drag: none;
-webkit-user-select: none;
-ms-user-select: none;
}
5 changes: 3 additions & 2 deletions static/templates/single_message.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<span class="message_sender{{^status_message}} sender_info_hover{{/status_message}}">
{{#include_sender}}
{{! See ../js/notifications.js for another user of avatar_url. }}
<div class="u-{{msg/sender_id}} inline_profile_picture{{#status_message}} sender_info_hover{{/status_message}}"
style="background-image: url('{{small_avatar_url}}');"/>
<div class="u-{{msg/sender_id}} inline_profile_picture{{#status_message}} sender_info_hover{{/status_message}}">
<img src="{{small_avatar_url}}" alt="{{msg/sender_id}}" class="no-drag"/>
</div>
{{#if status_message}}
<span class="sender-status">
<span class="sender_name-in-status sender_info_hover">{{msg/sender_full_name}}</span>
Expand Down
2 changes: 1 addition & 1 deletion templates/zerver/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<nav class="header-main rightside-userlist" id="top_navbar">
<div class="column-left">
<a class="no-style brand" href="#">
<div class="nav-logo"></div>
<img src="/static/images/logo/zulip-icon-128x128.png" class="nav-logo no-drag"/>
<div class="company-name">
zulip
</div>
Expand Down

0 comments on commit 74ab5b6

Please sign in to comment.