web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean less

Browse Source
This commit is contained in:
yflory 2017-07-10 11:57:04 +02:00
parent 159d72f33b
commit e8f3df5a46
3 changed files with 17 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
customize.dist/src/less/mixins.less
View File

@ -74,16 +74,16 @@
white-space: nowrap; white-space: nowrap;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
.name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.friend { .friend {
padding: 0; padding: 0;
} }
} }
.name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
media-tag { media-tag {
min-height: @width; min-height: @width;
min-width: @width; min-width: @width;

4
www/common/common-messaging.js
View File

@ -68,7 +68,7 @@ define([
var friends = proxy.friends || {}; var friends = proxy.friends || {};
Object.keys(friends).forEach(function (f) { Object.keys(friends).forEach(function (f) {
var data = friends[f]; var data = friends[f];
var $friend = $('<div>', {'class': 'friend'}).appendTo($block); var $friend = $('<div>', {'class': 'friend avatar'}).appendTo($block);
$friend.data('key', f); $friend.data('key', f);
var $rightCol = $('<span>', {'class': 'right-col'}); var $rightCol = $('<span>', {'class': 'right-col'});
$('<span>', {'class': 'name'}).text(data.displayName).appendTo($rightCol); $('<span>', {'class': 'name'}).text(data.displayName).appendTo($rightCol);
@ -149,7 +149,7 @@ define([
var data = getFriend(common, edPublic); var data = getFriend(common, edPublic);
var proxy = common.getProxy(); var proxy = common.getProxy();
var $header = $('<div>', {'class': 'header'}).appendTo($container); var $header = $('<div>', {'class': 'header avatar'}).appendTo($container);
$('<div>', {'class': 'messages'}).appendTo($container); $('<div>', {'class': 'messages'}).appendTo($container);
var $inputBlock = $('<div>', {'class': 'input'}).appendTo($container); var $inputBlock = $('<div>', {'class': 'input'}).appendTo($container);

64
www/friends/main.less
View File

@ -67,63 +67,17 @@ body {
} }
#friendList .friend, #messaging .header { #friendList .friend, #messaging .header {
overflow: hidden; .avatar(50px);
text-overflow: ellipsis; &.avatar {
font-size: 16px;
display: flex; display: flex;
align-items: center; }
cursor: pointer; cursor: pointer;
color: @color; color: @color;
.default, media-tag { media-tag {
display: inline-flex; img {
width: 50px; color: #000;
height: 50px;
justify-content: center;
align-items: center;
margin-right: 5px;
border-radius: 10px / 6px;
overflow: hidden;
border: 1px solid black;
box-sizing: content-box;
} }
.default { }
.unselectable();
background: white;
color: black;
font-size: 40px;
}
.right-col {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: flex;
flex-flow: column;
.name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.friend {
padding: 0;
}
}
media-tag {
min-height: 50px;
min-width: 50px;
max-height: 50px;
max-width: 50px;
img {
color: #000;
min-width: 100%;
min-height: 100%;
max-width: none;
max-height: none; // To override 'media-tag img' in slide.less
}
}
} }
#messaging { #messaging {