DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #239 from owncloud/play-with-layout

Browse Source 
Show preview images larger
This commit is contained in:
VicDeo 2014-04-17 16:42:39 +03:00
commit 4f4a3247a5
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
css/style.css
View File

@ -1,3 +1,12 @@
/* IE 8 fixes */
.ie8 .document label {
background-color: #fff;
}
.ie8 .add-document .upload {
margin-top: 5px;
}
/* end IE 8 fixes */
#editor ::-webkit-scrollbar-thumb { #editor ::-webkit-scrollbar-thumb {
background-color: #fff; background-color: #fff;
} }
@ -11,13 +20,14 @@
height: 200px; height: 200px;
width: 200px; width: 200px;
float: left; float: left;
background-color: #e8e8e8;
margin: 14px; margin: 14px;
vertical-align: top; vertical-align: top;
border-radius: 5px;
} }
.add-document a { .add-document a {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: inline-block; display: inline-block;
position: relative; position: relative;
height: 100px; height: 100px;
@ -27,19 +37,23 @@
background-position: 50%; background-position: 50%;
} }
.add-document a.add { .add-document a.add {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.add-document .add, .add-document .add,
.add-document .upload { .add-document .upload {
opacity: .7; opacity: .7;
border: 1px solid #e8e8e8;
}
.add-document .upload {
margin-top: 4px;
} }
.add-document .add:hover, .add-document .add:hover,
.add-document .add:focus, .add-document .add:focus,
.add-document #upload:hover .upload, .add-document #upload:hover .upload,
.add-document .upload:focus { .add-document .upload:focus {
opacity: 1; opacity: 1;
border: 1px solid #818181;
} }
.add-document label { .add-document label {
@ -51,10 +65,7 @@
} }
.documentslist .progress{ .documentslist .progress{
position:absolute; border: 1px solid #e8e8e8;
left:232px;
z-index:5;
background-color: #e8e8e8;
} }
.documentslist .progress div{ .documentslist .progress div{
@ -79,12 +90,16 @@
height: 200px; height: 200px;
width: 200px; width: 200px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 64px; background-size: 200px;
background-position: 68px; border: 1px solid #e8e8e8;
}
.document a:hover {
border: 1px solid #818181;
} }
.document label { .document label {
background: rgba(255, 255, 255, 0.7);
position: absolute; position: absolute;
bottom: 5px; bottom: 0px;
width: 100%; width: 100%;
font-weight: normal; font-weight: normal;
text-overflow: ellipsis; text-overflow: ellipsis;

4
js/documents.js
View File

@ -614,7 +614,7 @@ var documentsMain = {
a.attr('href', OC.generateUrl('apps/files/download{file}',{file:document.path})); a.attr('href', OC.generateUrl('apps/files/download{file}',{file:document.path}));
a.find('label').text(document.name); a.find('label').text(document.name);
a.css('background-image', 'url("'+document.icon+'")'); a.css('background-image', 'url("'+document.icon+'")');
Files.lazyLoadPreview(document.path, document.mimetype, function(node){ return function(path){node.css('background-image', 'url("'+ path +'")');}; }(a), 32, 40, document.etag, document.icon); Files.lazyLoadPreview(document.path, document.mimetype, function(node){ return function(path){node.css('background-image', 'url("'+ path +'")');}; }(a), 200, 200, document.etag, document.icon);
//function(path, mime, ready, width, height, etag) { //function(path, mime, ready, width, height, etag) {
$('.documentslist').append(docElem); $('.documentslist').append(docElem);
docElem.show(); docElem.show();
@ -649,7 +649,7 @@ var documentsMain = {
/*globals navigator,dojoConfig */ /*globals navigator,dojoConfig */
var usedLocale = "C"; var usedLocale = "C";
if (navigator && navigator.language.match(/^(de)/)) { if (navigator && navigator.language && navigator.language.match(/^(de)/)) {
usedLocale = navigator.language.substr(0,2); usedLocale = navigator.language.substr(0,2);
} }