From a0b14faf89a264ce5505fc4be0a597cf05958fa0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Jul 2017 13:11:16 +0200
Subject: [PATCH] Fix the font in settings and drive

---
 customize.dist/src/less/cryptpad.less | 1 -
 www/common/cryptpad-common.js         | 2 +-
 www/drive/file.less                   | 1 -
 www/settings/main.less                | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 46aa918ce..580a62b25 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -15,7 +15,6 @@ html.cp, .cp body {
     background-color: @page-white; //@base;
     color: @fore;
 
-    font-family: Ubuntu,Georgia,Cambria,serif;
     height: 100%;
 }
 .fa {
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 3960efa71..28d062457 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1620,7 +1620,7 @@ define([
                 content: Messages.user_rename
             });
         }
-        if (account) {
+        if (account && parsed && (!parsed.type || parsed.type !== 'profile')) {
             options.push({
                 tag: 'a',
                 attributes: {'class': 'profile'},
diff --git a/www/drive/file.less b/www/drive/file.less
index d0f472ee6..b950da8db 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -164,7 +164,6 @@ span {
 
 
 #tree {
-    font-family: Ubuntu,Georgia,Cambria,serif;
     font-size: 16px;
     //border-right: 1px solid #ccc;
     box-sizing: border-box;
diff --git a/www/settings/main.less b/www/settings/main.less
index 76ac5d582..954f48f52 100644
--- a/www/settings/main.less
+++ b/www/settings/main.less
@@ -37,6 +37,7 @@
             }
         }
         #rightSide {
+            flex: 1;
             padding: 5px 20px;
             color: @rightside-color;
             overflow: auto;