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-03-02 18:31:38 +01:00
commit 3b578aa1fd
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/drive/file.css
View File

@ -82,6 +82,10 @@ li {
color: #eee; color: #eee;
margin: -1px; margin: -1px;
} }
.selected .fa-minus-square-o,
.selected .fa-plus-square-o {
color: #000;
}
span.fa-folder, span.fa-folder,
span.fa-folder-open { span.fa-folder-open {
color: #FEDE8B; color: #FEDE8B;
@ -102,18 +106,21 @@ span.fa-folder-open {
color: #000; color: #000;
} }
#tree li { #tree li {
padding: 0 0 0 5px;
cursor: auto; cursor: auto;
} }
#tree li.collapsed ul { #tree li.collapsed ul {
display: none; display: none;
} }
#tree li input { #tree li input {
width: calc(70%); width: calc(100% - 30px);
} }
#tree li > span.element-row { #tree li > span.element-row {
width: 100%; width: calc(100% + 5px);
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin-left: -5px;
padding-left: 5px;
} }
#tree li > span.element-row:not(.selected):hover { #tree li > span.element-row:not(.selected):hover {
background-color: #eee; background-color: #eee;

10
www/drive/file.less
View File

@ -112,6 +112,9 @@ li {
background: #666; background: #666;
color: #eee; color: #eee;
margin: -1px; margin: -1px;
.fa-minus-square-o, .fa-plus-square-o {
color: @tree-fg;
}
} }
span { span {
@ -137,17 +140,20 @@ span {
padding: 10px 0px; padding: 10px 0px;
color: @tree-fg; color: @tree-fg;
li { li {
padding: 0 0 0 5px;
cursor: auto; cursor: auto;
&.collapsed ul { &.collapsed ul {
display: none; display: none;
} }
input { input {
width: calc(100% - 30px); width: ~"calc(100% - 30px)";
} }
& > span.element-row { & > span.element-row {
width: 100%; width: ~"calc(100% + 5px)";
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin-left: -5px;
padding-left: 5px;
} }
& > span.element-row:not(.selected):hover { & > span.element-row:not(.selected):hover {
background-color: @drive-hover; background-color: @drive-hover;

1
www/drive/main.js
View File

@ -1694,6 +1694,7 @@ define([
moveElements([path], [TRASH], false, refresh); moveElements([path], [TRASH], false, refresh);
} }
else if ($(this).hasClass('open')) { else if ($(this).hasClass('open')) {
$element.click();
$element.dblclick(); $element.dblclick();
} }
else if ($(this).hasClass('open_ro')) { else if ($(this).hasClass('open_ro')) {