Add friend app and fix avatar size
This commit is contained in:
@@ -489,6 +489,10 @@ define([
|
||||
return loadingScreen();
|
||||
};
|
||||
|
||||
Pages['/friends/'] = Pages['/friends/index.html'] = function () {
|
||||
return loadingScreen();
|
||||
};
|
||||
|
||||
Pages['/pad/'] = Pages['/pad/index.html'] = function () {
|
||||
return loadingScreen();
|
||||
};
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
.slideColor { color: @toolbar-slide-bg; }
|
||||
.pollColor { color: @toolbar-poll-bg; }
|
||||
.fileColor { color: @toolbar-file-bg; }
|
||||
.friendsColor { color: @toolbar-friends-bg; }
|
||||
.whiteboardColor { color: @toolbar-whiteboard-bg; }
|
||||
.driveColor { color: @toolbar-drive-bg; }
|
||||
.defaultColor { color: @toolbar-default-bg; }
|
||||
@@ -165,7 +166,6 @@ body .userlist-drawer {
|
||||
min-height: 100%;
|
||||
max-width: none;
|
||||
max-height: none; // To override 'media-tag img' in slide.less
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -310,6 +310,11 @@ body {
|
||||
@color: @toolbar-file-color;
|
||||
.addToolbarColors(@color, @bgcolor);
|
||||
}
|
||||
&.app-friends {
|
||||
@bgcolor: @toolbar-friends-bg;
|
||||
@color: @toolbar-friends-color;
|
||||
.addToolbarColors(@color, @bgcolor);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -97,6 +97,8 @@
|
||||
@toolbar-drive-color: #fff;
|
||||
@toolbar-file-bg: #cd2532;
|
||||
@toolbar-file-color: #fff;
|
||||
@toolbar-friends-bg: #607B8D;
|
||||
@toolbar-friends-color: #fff;
|
||||
@toolbar-default-bg: #ddd;
|
||||
@toolbar-default-color: #000;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ $(function () {
|
||||
var Messages = Cryptpad.Messages;
|
||||
var $body = $('body');
|
||||
var isMainApp = function () {
|
||||
return /^\/(pad|code|slide|poll|whiteboard|file|media|drive)\/$/.test(location.pathname);
|
||||
return /^\/(pad|code|slide|poll|whiteboard|file|media|friends|drive)\/$/.test(location.pathname);
|
||||
};
|
||||
|
||||
var rightLink = function (ref, loc, txt) {
|
||||
@@ -148,6 +148,9 @@ $(function () {
|
||||
} else if (/file/.test(pathname)) {
|
||||
$('body').append(h('body', Pages[pathname]()).innerHTML);
|
||||
require([ '/file/main.js' ], ready);
|
||||
} else if (/friends/.test(pathname)) {
|
||||
$('body').append(h('body', Pages[pathname]()).innerHTML);
|
||||
require([ '/friends/main.js' ], ready);
|
||||
} else if (/pad/.test(pathname)) {
|
||||
$('body').append(h('body', Pages[pathname]()).innerHTML);
|
||||
require([ '/pad/main.js' ], ready);
|
||||
|
||||
Reference in New Issue
Block a user