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

Small fixes for the new toolbar

Browse Source
This commit is contained in:
yflory
2017-06-29 15:15:40 +02:00
parent 877c5a8d0e
commit 56a25e1036
12 changed files with 300 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
customize.dist/images/avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

2
customize.dist/src/less/cryptpad.less
View File

@@ -577,7 +577,7 @@ noscript {
line-height: 24px;
vertical-align: middle;
.usage {
height: 24px;
height: 100%;
display: inline-block;
background: blue;
position: absolute;

21
customize.dist/src/less/dropdown.less
View File

@@ -32,6 +32,9 @@
z-index: 1000;
max-height: 300px;
overflow-y: auto;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-size: 16px;
line-height: 1em;
&.left {
right: 0;
@@ -45,7 +48,7 @@
color: black;
padding: 5px 16px;
text-decoration: none;
display: block;
display: flex;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
@@ -53,6 +56,16 @@
user-select: none;
float: none;
text-align: left;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-size: 16px;
line-height: 1em;
.fa {
width: 20px;
text-align: center;
margin-right: 5px;
}
&:hover {
background-color: #f1f1f1;
@@ -77,7 +90,13 @@
margin: 0;
white-space: normal;
text-align: left;
color: black;
font-size: 14px;
* {
font-size: 14px;
}
h2 {
color: black;
font-weight: bold;
text-align: center;
background-color: #EEEEEE;

65
customize.dist/src/less/toolbar.less
View File

@@ -28,16 +28,38 @@
#cke_1_contents {
margin-top: -1px;
display: flex;
overflow: visible;
}
.padColor { color: @toolbar-pad-bg; }
.codeColor { color: @toolbar-code-bg; }
.slideColor { color: @toolbar-slide-bg; }
.pollColor { color: @toolbar-poll-bg; }
.fileColor { color: @toolbar-file-bg; }
.whiteboardColor { color: @toolbar-whiteboard-bg; }
.driveColor { color: @toolbar-drive-bg; }
.defaultColor { color: @toolbar-default-bg; }
.userlist-drawer {
font: normal normal normal 14px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
min-width: 175px;
width: 175px;
display: block;
overflow-y: auto;
overflow-x: hidden;
padding: 10px;
box-sizing: border-box;
.close {
position: absolute;
margin-top: -11px;
margin-left: 149px;
font-size: 15px;
opacity: 0.5;
cursor: pointer;
&:hover {
opacity: 1;
}
}
h2 {
color: inherit;
font-size: 1.2em;
@@ -96,24 +118,20 @@ body {
}
.cryptpad-toolbar-leftside, .cryptpad-toolbar-rightside, .drawer-content {
background-color: lighten(@bgcolor, 8%);
button:hover {
button:hover, button.active {
background-color: @bgcolor;
}
}
.hoverable:hover {
.editable {
.editable, .pencilIcon {
cursor: text;
border: 1px solid darken(@bgcolor, 15%);
background: darken(@bgcolor, 10%);
transition: all 0.15s;
color: @color;
}
.pencilIcon {
border: 1px solid darken(@bgcolor, 15%);
background: darken(@bgcolor, 10%);
color: @color;
&:hover {
background: darken(@bgcolor, 5%);
}
.editable {
cursor: text;
}
}
.saveIcon {
@@ -129,7 +147,7 @@ body {
background: darken(@bgcolor, 10%);
color: @color;
}
.dropdown-bar-content {
/*.dropdown-bar-content {
background: darken(@bgcolor, 5%);
border: 1px solid @color;
color: @color;
@@ -155,7 +173,7 @@ body {
background-color: @bgcolor;
}
}
}
}*/
}
}
@@ -229,9 +247,6 @@ body {
margin: 0;
background: transparent;
}
.dropdown-bar-content {
line-height: 14px;
}
}
.separator {
@@ -248,6 +263,7 @@ body {
}
button {
transition: all 0.15s;
.unselectable();
&#shareButton, &.buttonSuccess {
// Bootstrap 4 colors
@@ -297,14 +313,9 @@ body {
}
}
.cryptpad-toolbar-rightside button, .cryptpad-toolbar-leftside button {
//background-color: #fff;
//border-color: #ccc;
background: transparent;
&:hover {
//color: #292b2c;
background-color: rgba(50,50,50,0.3);
//background-color: #e6e6e6;
border-color: #adadad;
}
}
@@ -603,7 +614,7 @@ body {
display: inline-flex;
align-items: center;
line-height: @toolbar-top-height;
margin: 0 20px;
margin: 0 10px;
.title, .pencilIcon, .saveIcon {
font-size: 25px;
vertical-align: middle;
@@ -671,6 +682,8 @@ body {
}
order: 2;
text-align: center;
font-size: 32px;
margin-left: 10px;
&> button {
display: flex;
align-items: center;
@@ -696,10 +709,6 @@ body {
color: inherit;
}
}
.dropdown-bar-content {
font-size: 12px;
line-height: 14px;
}
}
.cryptpad-link {
display: inline-flex;
@@ -728,6 +737,7 @@ body {
display: inline-block;
order: 5;
line-height: @toolbar-top-height;
color: white;
&> * {
display: inline-block;
height: 100%;
@@ -739,13 +749,15 @@ body {
cursor: pointer;
}
.cryptpad-user-dropdown {
margin-left: 20px;
z-index: 10000;
//margin-left: 20px;
height: 64px;
width: 64px;
padding: 0px;
box-sizing: border-box;
text-align: center;
background-color: rgba(0,0,0,0.3);
transition: all 0.15s;
&:hover {
background-color: rgba(0,0,0,0.4);
}
@@ -838,6 +850,9 @@ body {
display: flex;
flex-flow: column;
z-index:1000;
.fa {
font-size: 17px;
}
&> span {
box-sizing: border-box;
width: 150px;

2
customize.dist/translations/messages.fr.js
View File

@@ -241,7 +241,7 @@ define(function () {
out.fm_templateName = "Modèles";
out.fm_searchName = "Recherche";
out.fm_searchPlaceholder = "Rechercher...";
out.fm_newButton = "Ajouter à ce dossier";
out.fm_newButton = "Nouveau";
out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant";
out.fm_newFolder = "Nouveau dossier";
out.fm_newFile = "Nouveau pad";

2
customize.dist/translations/messages.js
View File

@@ -244,7 +244,7 @@ define(function () {
out.fm_templateName = "Templates";
out.fm_searchName = "Search";
out.fm_searchPlaceholder = "Search...";
out.fm_newButton = "Add to this folder";
out.fm_newButton = "New";
out.fm_newButtonTitle = "Create a new pad or folder, import a file in the current folder";
out.fm_newFolder = "New folder";
out.fm_newFile = "New pad";