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:
yflory 2017-03-02 18:16:20 +01:00
commit 6098f28260
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,7 @@
} }
button { button {
color: #000;
background-color: inherit; background-color: inherit;
background-image: linear-gradient(to bottom,#fff,#e4e4e4); background-image: linear-gradient(to bottom,#fff,#e4e4e4);
border: 1px solid #A6A6A6; border: 1px solid #A6A6A6;
@ -253,13 +254,12 @@
input { input {
font-size: 1.5em; font-size: 1.5em;
vertical-align: middle; vertical-align: middle;
height: 100%;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid black; border: 1px solid black;
background: #fff; background: #fff;
cursor: auto; cursor: auto;
width: 300px; width: 300px;
padding: 0px 5px; padding: 5px 5px;
} }
} }
.cryptpad-link { .cryptpad-link {

4
customize.dist/toolbar.css
View File

@ -164,6 +164,7 @@
margin-right: 2px; margin-right: 2px;
} }
.cryptpad-toolbar button { .cryptpad-toolbar button {
color: #000;
background-color: inherit; background-color: inherit;
background-image: linear-gradient(to bottom, #fff, #e4e4e4); background-image: linear-gradient(to bottom, #fff, #e4e4e4);
border: 1px solid #A6A6A6; border: 1px solid #A6A6A6;
@ -324,13 +325,12 @@
.cryptpad-toolbar-top .cryptpad-title input { .cryptpad-toolbar-top .cryptpad-title input {
font-size: 1.5em; font-size: 1.5em;
vertical-align: middle; vertical-align: middle;
height: 100%;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid black; border: 1px solid black;
background: #fff; background: #fff;
cursor: auto; cursor: auto;
width: 300px; width: 300px;
padding: 0px 5px; padding: 5px 5px;
} }
.cryptpad-toolbar-top .cryptpad-link { .cryptpad-toolbar-top .cryptpad-link {
position: absolute; position: absolute;

2
www/drive/file.css
View File

@ -66,6 +66,7 @@ li {
.contextMenu { .contextMenu {
display: none; display: none;
position: absolute; position: absolute;
z-index: 50;
} }
.contextMenu li { .contextMenu li {
padding: 0; padding: 0;
@ -248,6 +249,7 @@ span.fa-folder-open {
} }
#content div.grid li input { #content div.grid li input {
width: 100%; width: 100%;
margin-top: 5px;
} }
#content div.grid li .fa { #content div.grid li .fa {
display: block; display: block;

2
www/drive/file.less
View File

@ -95,6 +95,7 @@ li {
.contextMenu { .contextMenu {
display: none; display: none;
position: absolute; position: absolute;
z-index: 50;
li { li {
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
@ -293,6 +294,7 @@ span {
} }
input { input {
width: 100%; width: 100%;
margin-top: 5px;
} }
.fa { .fa {
display: block; display: block;

3
www/drive/main.js
View File

@ -1423,7 +1423,8 @@ define([
// Open the menu // Open the menu
$iframe.find('.contextMenu').css({ $iframe.find('.contextMenu').css({
top: ($context.offset().top + 32) + 'px', top: ($context.offset().top + 32) + 'px',
right: '0px' right: '0px',
left: ''
}); });
$li.contextmenu(); $li.contextmenu();
}); });

1
www/poll/index.html
View File

@ -88,6 +88,7 @@
margin: auto; margin: auto;
min-width: 80%; min-width: 80%;
width: 80%;
min-height: 5em; min-height: 5em;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;