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

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

Browse Source
This commit is contained in:
ansuz 2017-01-31 19:49:29 +01:00
commit b143aef778
10 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/index.html
View File

@ -76,9 +76,9 @@
<!--<button class="btn btn-secondary knowmore">Know more</button>-->
<!--<button class="btn btn-secondary tryit">Discover our tools</button>-->
<!--<br>-->
<!--<button class="btn btn-success nologin" data-localization="login_nologin"></button>-->
<button class="btn btn-secondary nologin" data-localization="login_nologin"></button>
<!--<button class="btn btn-success nologin">Make a pad right now</button>-->
<p class="buttons"><a id="create-pad" href="/pad/"><button class="btn btn-success nologin">Make a pad right now</button></a></p>
<!--<p class="buttons"></p>-->
</div>
</div>

11
customize.dist/main.css
View File

@ -347,7 +347,7 @@
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 200px;
min-width: 250px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
z-index: 1000;
max-height: 300px;
@ -450,14 +450,6 @@
font-weight: 500;
font-size: 0.75em;
color: #558;
/* text-align: center;
min-width: 100px;
font-weight: bold;
height: 70px;
padding: 0 10px;
line-height: 70px;
display: inline-block;
color: @topbar-button-color;*/
}
#cryptpadTopBar .right a:hover {
text-decoration: none;
@ -735,6 +727,7 @@ html.cp,
height: calc(100vh - 150px);
min-height: 450px;
margin: auto;
z-index: 1;
font-size: medium;
}
.cp #main #main-container,

18
customize.dist/main.js
View File

@ -35,9 +35,25 @@ define([
var displayCreateButtons = function () {
var $parent = $('#buttons');
var options = [];
Config.availablePadTypes.forEach(function (el) {
$('#create-' + el).attr('target', '_blank').show();
options.push({
tag: 'a',
attributes: {
'class': 'newdoc',
'href': '/' + el,
'target': '_blank'
},
content: Messages['button_new' + el] // Pretty name of the language value
});
});
var dropdownConfig = {
text: Messages.makeAPad, // Button initial text
options: options, // Entries displayed in the menu
};
var $block = Cryptpad.createDropdown(dropdownConfig);
$block.find('button').addClass('btn').addClass('btn-success');
$block.appendTo($parent);
};
// Language selector

4
customize.dist/src/fragments/index.html
View File

@ -10,9 +10,9 @@
<!--<button class="btn btn-secondary knowmore">Know more</button>-->
<!--<button class="btn btn-secondary tryit">Discover our tools</button>-->
<!--<br>-->
<!--<button class="btn btn-success nologin" data-localization="login_nologin"></button>-->
<button class="btn btn-secondary nologin" data-localization="login_nologin"></button>
<!--<button class="btn btn-success nologin">Make a pad right now</button>-->
<p class="buttons"><a id="create-pad" href="/pad/"><button class="btn btn-success nologin">Make a pad right now</button></a></p>
<!--<p class="buttons"></p>-->
</div>
</div>

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

@ -297,6 +297,7 @@ body.html {
min-height: 450px;
margin: auto;
//margin-top: 100px;
z-index: 1;
font-size: medium;

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

@ -26,7 +26,7 @@
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 200px;
min-width: 250px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
z-index: 1000;
max-height: 300px;

8
customize.dist/src/less/topbar.less
View File

@ -54,14 +54,6 @@
text-decoration: none;
color: #000;
}
/* text-align: center;
min-width: 100px;
font-weight: bold;
height: 70px;
padding: 0 10px;
line-height: 70px;
display: inline-block;
color: @topbar-button-color;*/
}
}
}

2
customize.dist/toolbar.css
View File

@ -13,7 +13,7 @@
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 200px;
min-width: 250px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
z-index: 1000;
max-height: 300px;

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

@ -296,6 +296,7 @@ define(function () {
out.table_created = 'Créé le';
out.table_last = 'Dernier accès';
out.makeAPad = 'Créer un document';
out.button_newpad = 'Nouveau document texte';
out.button_newcode = 'Nouvelle page de code';
out.button_newpoll = 'Nouveau sondage';

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

@ -294,6 +294,7 @@ define(function () {
out.table_created = 'Created';
out.table_last = 'Last Accessed';
out.makeAPad = 'Make a pad right now';
out.button_newpad = 'New Rich Text pad';
out.button_newcode = 'New Code pad';
out.button_newpoll = 'New Poll';