Skip to content

Commit

Permalink
elFinder up to newly ( Studio-42/elFinder@048a340 )
Browse files Browse the repository at this point in the history
  • Loading branch information
@nao-pon
nao-pon committed May 5, 2018
1 parent 201408e commit 530db3b
Show file tree
Hide file tree
Showing 75 changed files with 4,571 additions and 2,446 deletions.
4 changes: 2 additions & 2 deletions html/common/elfinder/README.md
View file
@@ -1,7 +1,7 @@
elFinder
========

**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.35 OR EARLIER) VERSIONS OF ELFINDER ON PUBLIC SERVERS, IT MAY CAUSE SERIOUS DAMAGE TO YOUR SERVER AND VISITED USER. YOU SHOULD UPDATE TO THE LATEST VERSION OR REMOVE IT FROM THE SERVER.**
**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.36 OR EARLIER) VERSIONS OF ELFINDER ON PUBLIC SERVERS, IT MAY CAUSE SERIOUS DAMAGE TO YOUR SERVER AND VISITED USER. YOU SHOULD UPDATE TO THE LATEST VERSION OR REMOVE IT FROM THE SERVER.**

<pre>
_ ______ _ _
Expand Down Expand Up @@ -128,7 +128,7 @@ Installation
Downloads
------------
**Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
+ [elFinder 2.1.37](https://github.com/Studio-42/elFinder/archive/2.1.37.zip)
+ [elFinder 2.1.38](https://github.com/Studio-42/elFinder/archive/2.1.38.zip)
+ [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)

**Nightly builds**
Expand Down
48 changes: 32 additions & 16 deletions html/common/elfinder/css/commands.css
View file
Expand Up @@ -328,7 +328,16 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
overflow: auto;
padding: 10px;
}
.elfinder-dialog .ui-tabs .ui-tabs-nav li a { padding:.2em 1em;}
.elfinder-dialog .ui-tabs .ui-tabs-nav li a {
padding:.2em .8em;
display: inline-block;
}
.elfinder-touch .elfinder-dialog .ui-tabs .ui-tabs-nav li a {
padding:.5em .5em;
}
.elfinder-dialog .ui-tabs-selected a {
background: inherit;
}

.elfinder-help-shortcuts {
height: auto;
Expand Down Expand Up @@ -464,47 +473,54 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
/*font-size: 1.2em;*/
}

.elfinder-help-preference {
padding: 10px;
height: auto;
min-height: 100%;
/********************** COMMAND "PREFERENCE" ****************************/
/* fix tabs */
.elfinder-preference .ui-tabs-panel {
padding: 0 10px;
overflow: auto;
box-sizing: border-box;
-webkit-overflow-scrolling: touch;
}

.elfinder-help-preference dl {
.elfinder-preference a.ui-state-hover,
.elfinder-preference label.ui-state-hover {
border: none;
}
.elfinder-preference dl {
width: 100%;
display: inline-block;
margin: .5em 0;
}
.elfinder-help-preference dt {
.elfinder-preference dt {
display: block;
width: 200px;
clear: left;
float: left;
max-width: 50%;
}
.elfinder-rtl .elfinder-help-preference dt {
.elfinder-rtl .elfinder-preference dt {
clear: right;
float: right;
}
.elfinder-help-preference dd {
.elfinder-preference dd {
margin-bottom: 1em;
}
.elfinder-help-preference dt label {
.elfinder-preference dt label {
cursor: pointer;
}
.elfinder-help-preference dd label,
.elfinder-help-preference dd input[type=checkbox] {
.elfinder-preference dd label,
.elfinder-preference dd input[type=checkbox] {
white-space: nowrap;
display: inline-block;
cursor: pointer;
}
.elfinder-help-preference dt.elfinder-help-checkboxes {
.elfinder-preference dt.elfinder-preference-checkboxes {
width: 100%;
max-width: none;
}
.elfinder-help-preference dd.elfinder-help-checkboxes {
.elfinder-preference dd.elfinder-preference-checkboxes {
padding-top: 3ex;
}
.elfinder-help-preference select {
.elfinder-preference select {
max-width: 100%;
}

Expand Down
12 changes: 12 additions & 0 deletions html/common/elfinder/css/common.css
View file
Expand Up @@ -17,6 +17,18 @@
font-family: Verdana,Arial,Helvetica,sans-serif;
}

/* prevent auto zoom on iOS */
.elfinder-ios input,
.elfinder-ios select,
.elfinder-ios textarea {
font-size: 16px !important;
}

/* full screen mode */
.elfinder.elfinder-fullscreen > .ui-resizable-handle {
display: none;
}

.elfinder-font-mono {
line-height: 2ex;
}
Expand Down
111 changes: 91 additions & 20 deletions html/common/elfinder/css/cwd.css
View file
Expand Up @@ -13,12 +13,53 @@

/* container */
.elfinder-cwd {
position:relative;
position:absolute;
top: 0;
cursor:default;
padding:0;
margin:0;
-ms-touch-action: auto;
touch-action: auto;
min-width: 100%;
}
.elfinder-ltr .elfinder-cwd {
left: 0;
}
.elfinder-rtl .elfinder-cwd {
right: 0;
}

.elfinder-cwd.elfinder-table-header-sticky {
position: -webkit-sticky;
position: -ms-sticky;
position: sticky;
top: 0;
left: auto;
right: auto;
width: -webkit-max-content;
width: -moz-max-content;
width: -ms-max-content;
width: max-content;
height: 0;
overflow: visible;
}

.elfinder-cwd.elfinder-table-header-sticky table {
border-top: 2px solid;
padding-top: 0;
}

.elfinder-cwd.elfinder-table-header-sticky td {
display: inline-block;
}

.elfinder-droppable-active .elfinder-cwd.elfinder-table-header-sticky table {
border-top: 2px solid transparent;
}

/* fixed table header container */
.elfinder-cwd-fixheader .elfinder-cwd {
position: relative;
}

/* container active on dropenter */
Expand Down Expand Up @@ -108,19 +149,11 @@
padding-bottom:2px;
cursor:default;
border:none;
/* overflow:hidden;*/
position:relative;
}

/*.elfinder-cwd-view-icons .elfinder-cwd-file .elfinder-cwd-select {
top: 0px;
left: 0px;
}*/

/*.elfinder-rtl .elfinder-cwd-view-icons .elfinder-cwd-file .elfinder-cwd-select {
left: auto;
right: 7px;
}*/
.elfinder-cwd-view-icons .elfinder-cwd-file .ui-state-active {
border:none;
}

/* ltr/rtl enviroment */
.elfinder-ltr .elfinder-cwd-view-icons .elfinder-cwd-file { float:left; margin:0 3px 2px 0; }
Expand Down Expand Up @@ -265,7 +298,7 @@
.elfinder-cwd .elfinder-navbar-root-network.elfinder-droppable-active .elfinder-cwd-icon,
.elfinder-cwd-view-list .elfinder-navbar-root-network td .elfinder-cwd-icon {
background-image:url("../img/toolbar.png");
background-position: 0 71.65%; /* Don't forget change % when toolbar.png edited */
background-position: 0 70.5%; /* Don't forget change % when toolbar.png edited */
background-size: cover;
}
.elfinder-cwd .elfinder-navbar-root-network.elfinder-droppable-active .elfinder-cwd-icon {
Expand Down Expand Up @@ -678,7 +711,7 @@
}

.elfinder-touch .elfinder-cwd thead .elfinder-cwd-selectall {
padding-top: 5px;
padding-top: 4px;
}

.elfinder .elfinder-cwd table thead tr { border-left:0 solid; border-top:0 solid; border-right:0 solid; }
Expand All @@ -692,6 +725,11 @@
.elfinder-rtl .elfinder-cwd.elfinder-has-checkbox table thead td:first-child {
padding: 4px 22px 4px 14px;
}
.elfinder-touch .elfinder-cwd table thead td,
.elfinder-touch .elfinder-cwd.elfinder-has-checkbox table thead td:first-child {
padding-top: 8px;
padding-bottom: 8px;
}

.elfinder .elfinder-cwd table thead td.ui-state-active {
background: #ebf1f6;
Expand Down Expand Up @@ -734,10 +772,6 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
padding: 10px 12px;
}

.elfinder-touch .elfinder-cwd table thead td {
padding: 8px 14px;
}

.elfinder-touch .elfinder-cwd tr.elfinder-cwd-file td {
padding: 13px 12px;
}
Expand Down Expand Up @@ -792,10 +826,10 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
/* table header resize handle */
.elfinder-cwd-view-list thead td .ui-resizable-handle {
height: 100%;
top: 3px;
top: 6px;
}
.elfinder-touch .elfinder-cwd-view-list thead td .ui-resizable-handle {
top: -5px;
top: -4px;
margin: 10px;
}
.elfinder-cwd-view-list thead td .ui-resizable-e {
Expand All @@ -815,3 +849,40 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
.elfinder-cwd-wrapper-empty .elfinder-cwd-view-list.elfinder-cwd:after {
margin-top: 0;
}

/* overlay message board */
.elfinder-cwd-message-board {
position: absolute;
position: -webkit-sticky;
position: sticky;
width: 100%;
height: calc(100% - 0.01px); /* for Firefox scroll problem */
top: 0;
left: 0;
margin: 0;
padding: 0;
pointer-events: none;
background-color: transparent;
}
/* overlay message board for trash */
.elfinder-cwd-wrapper-trash .elfinder-cwd-message-board {
background-image: url(../img/trashmesh.png);
}
.elfinder-cwd-message-board .elfinder-cwd-trash {
position: absolute;
bottom: 0;
font-size: 30px;
width: 100%;
text-align: right;
display: none;
}
.elfinder-rtl .elfinder-cwd-message-board .elfinder-cwd-trash {
text-align: left;
}
.elfinder-mobile .elfinder-cwd-message-board .elfinder-cwd-trash {
font-size: 20px;
}
.elfinder-cwd-wrapper-trash .elfinder-cwd-message-board .elfinder-cwd-trash {
display: block;
opacity: .3;
}

0 comments on commit 530db3b

Please sign in to comment.