Skip to content

Commit

Permalink
Dark theme as default, rolled back addition of incomplete features
Browse files Browse the repository at this point in the history
  • Loading branch information
nightsh committed Mar 29, 2013
1 parent 72aec13 commit 91d3b73
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 33 deletions.
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// GENERAL SETTINGS

'disabled' => false,
'theme' => "oxygen",
'theme' => "dark",
'uploadURL' => "/kcfinder/upload",
'uploadDir' => "",

Expand Down
14 changes: 0 additions & 14 deletions js/browser/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,6 @@ browser.menuFile = function(file, e) {
html +=
'<a href="kcact:download">' + this.label("Download") + '</a>';

if (this.access.files.copy || this.access.files.move)
html += (html.length ? '<div class="delimiter"></div>' : '') +
'<a href="kcact:imgresize">' + this.label("Resize Image") + '</a>';
if (this.access.files.copy || this.access.files.move)
html += (html.length ? '' : '') +
'<a href="kcact:imgcrop">' + this.label("Crop Image") + '</a>';
if (this.access.files.copy || this.access.files.move)
html += '<div class="delimiter"></div>' +
'<a href="kcact:clpbrdadd">' + this.label("Add to Clipboard") + '</a>';
Expand Down Expand Up @@ -447,14 +441,6 @@ browser.menuFile = function(file, e) {
return false;
});

$('.menu a[href="kcact:imgcrop"]').click(function() {
alert("Crop selected!");
});

$('.menu a[href="kcact:imgresize"]').click(function() {
alert("Resize selected!");
});

$('.menu a[href="kcact:clpbrdadd"]').click(function() {
for (i = 0; i < browser.clipboard.length; i++)
if ((browser.clipboard[i].name == data.name) &&
Expand Down
10 changes: 1 addition & 9 deletions themes/dark/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -365,14 +365,6 @@ tr.selected:hover > td {
background-image: url(img/icons/delete.png);
}

.menu a[href="kcact:imgresize"] {
background-image: url(img/icons/resize.png);
}

.menu a[href="kcact:imgcrop"] {
background-image: url(img/icons/crop.png);
}

.menu a[href="kcact:clpbrdadd"] {
background-image: url(img/icons/clipboard-add.png);
}
Expand Down Expand Up @@ -565,4 +557,4 @@ span.close:hover {

span.clicked:hover {
background-image: url(img/icons/close-clicked.png);
}
}
10 changes: 1 addition & 9 deletions themes/oxygen/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,6 @@ tr.selected:hover > td {
background-image: url(img/icons/delete.png);
}

.menu a[href="kcact:imgresize"] {
background-image: url(img/icons/resize.png);
}

.menu a[href="kcact:imgcrop"] {
background-image: url(img/icons/crop.png);
}

.menu a[href="kcact:clpbrdadd"] {
background-image: url(img/icons/clipboard-add.png);
}
Expand Down Expand Up @@ -571,4 +563,4 @@ span.close:hover {

span.clicked:hover {
background: url(img/icons/close-clicked.png);
}
}
Binary file removed upload/.thumbs/files/llamas.jpg
Binary file not shown.
Binary file removed upload/files/llamas.jpg
Binary file not shown.

0 comments on commit 91d3b73

Please sign in to comment.