Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz
2017-03-15 18:59:38 +01:00
14 changed files with 58 additions and 14 deletions

View File

@@ -56,6 +56,22 @@
margin-left: 5px;
}
}
&#newdoc {
// Bootstrap 4 colors
color: #fff;
background: #0275d8;
border-color: #0275d8;
&:hover {
background: #025aa5;
border: 1px solid #01549b;
}
span {
color: #fff;
}
.large {
margin-left: 5px;
}
}
&.hidden {
display: none;
}
@@ -141,7 +157,6 @@
}
}
.big {
@media screen and (max-width: @media-not-big) {
display: none;

View File

@@ -132,6 +132,21 @@
.cryptpad-toolbar button#shareButton .large {
margin-left: 5px;
}
.cryptpad-toolbar button#newdoc {
color: #fff;
background: #0275d8;
border-color: #0275d8;
}
.cryptpad-toolbar button#newdoc:hover {
background: #025aa5;
border: 1px solid #01549b;
}
.cryptpad-toolbar button#newdoc span {
color: #fff;
}
.cryptpad-toolbar button#newdoc .large {
margin-left: 5px;
}
.cryptpad-toolbar button.hidden {
display: none;
}

View File

@@ -145,6 +145,7 @@ define(function () {
out.fm_filesDataName = "Tous les fichiers";
out.fm_templateName = "Modèles";
out.fm_newButton = "Nouveau";
out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier";
out.fm_newFolder = "Nouveau dossier";
out.fm_newFile = "Nouveau pad";
out.fm_folder = "Dossier";

View File

@@ -147,6 +147,7 @@ define(function () {
out.fm_filesDataName = "All files";
out.fm_templateName = "Templates";
out.fm_newButton = "New";
out.fm_newButtonTitle = "Create a new pad or folder";
out.fm_newFolder = "New folder";
out.fm_newFile = "New pad";
out.fm_folder = "Folder";