New toolbar temp

This commit is contained in:
yflory
2017-06-12 15:59:24 +02:00
parent 9c5bade83e
commit 376b60c21c
35 changed files with 679 additions and 25 deletions

View File

@@ -38,7 +38,7 @@ CKEDITOR.editorConfig = function( config ) {
//skin: 'moono-cryptpad,/pad/themes/moono-cryptpad/'
//skin: 'flat,/pad/themes/flat/'
//skin: 'moono-lisa,/pad/themes/moono-lisa/'
config.skin= 'moono-lisa,/pad/themes/moono-lisa/'
//skin: 'moono-dark,/pad/themes/moono-dark/'
//skin: 'office2013,/pad/themes/office2013/'
};

View File

@@ -28,6 +28,8 @@
box-sizing: border-box;
padding: 0px 6px;
background-color: #BBBBFF;
.fa {
font: normal normal normal 14px/1 FontAwesome;
font-family: FontAwesome;
@@ -321,13 +323,12 @@
height: 32px;
position: relative;
.cryptpad-title {
.title, .pencilIcon {
.title, .pencilIcon, .saveIcon {
font-size: 1.5em;
vertical-align: middle;
line-height: 32px;
}
.pencilIcon {
//display: none;
margin-left: 11px;
&:hover {
color: #999;
@@ -337,6 +338,22 @@
cursor: pointer;
}
}
.saveIcon {
cursor: pointer;
border: 1px solid black;
border-radius: 0px 2px 2px 0px;
background: white;
padding: 5px;
display: inline;
margin-left: -1px;
border-collapse: collapse;
&:hover {
color: #999;
}
span {
cursor: pointer;
}
}
&:not(input):hover {
.editable {
border: 1px solid #888;
@@ -410,6 +427,7 @@
}
}
.cryptpad-toolbar-leftside {
height: 32px;
float: left;
margin-bottom: -1px;
.cryptpad-dropdown-users {
@@ -427,6 +445,7 @@
}
}
.cryptpad-toolbar-rightside {
height: 32px;
text-align: right;
}
.cryptpad-toolbar-history {

View File

@@ -101,6 +101,7 @@
.cryptpad-toolbar {
box-sizing: border-box;
padding: 0px 6px;
background-color: #BBBBFF;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
@@ -406,7 +407,8 @@
position: relative;
}
.cryptpad-toolbar-top .cryptpad-title .title,
.cryptpad-toolbar-top .cryptpad-title .pencilIcon {
.cryptpad-toolbar-top .cryptpad-title .pencilIcon,
.cryptpad-toolbar-top .cryptpad-title .saveIcon {
font-size: 1.5em;
vertical-align: middle;
line-height: 32px;
@@ -421,6 +423,22 @@
.cryptpad-toolbar-top .cryptpad-title .pencilIcon span {
cursor: pointer;
}
.cryptpad-toolbar-top .cryptpad-title .saveIcon {
cursor: pointer;
border: 1px solid black;
border-radius: 0px 2px 2px 0px;
background: white;
padding: 5px;
display: inline;
margin-left: -1px;
border-collapse: collapse;
}
.cryptpad-toolbar-top .cryptpad-title .saveIcon:hover {
color: #999;
}
.cryptpad-toolbar-top .cryptpad-title .saveIcon span {
cursor: pointer;
}
.cryptpad-toolbar-top .cryptpad-title:not(input):hover .editable {
border: 1px solid #888;
border-radius: 2px 0px 0px 2px;
@@ -485,6 +503,7 @@
vertical-align: baseline;
}
.cryptpad-toolbar-leftside {
height: 32px;
float: left;
margin-bottom: -1px;
}
@@ -500,6 +519,7 @@
margin-top: -1px;
}
.cryptpad-toolbar-rightside {
height: 32px;
text-align: right;
}
.cryptpad-toolbar-history {

View File

@@ -97,6 +97,7 @@ define(function () {
out.user_accountName = "Nom d'utilisateur";
out.clickToEdit = 'Cliquer pour modifier';
out.saveTitle = "Enregistrer le titre (Entrée)";
out.forgetButtonTitle = 'Déplacer ce pad vers la corbeille';
out.forgetPrompt = 'Cliquer sur OK déplacera ce pad vers la corbeille de votre CryptDrive, êtes-vous sûr ?';

View File

@@ -99,6 +99,7 @@ define(function () {
out.user_accountName = "Account name";
out.clickToEdit = "Click to edit";
out.saveTitle = "Save the title (enter)";
out.forgetButtonTitle = 'Move this pad to the trash';
out.forgetPrompt = 'Clicking OK will move this pad to your trash. Are you sure?';