From 468bde67ff310d097b79e52a69001988554a562b Mon Sep 17 00:00:00 2001 From: Raghu Nayyar Date: Sun, 30 Aug 2015 14:17:18 +0200 Subject: [PATCH] Removes unecessary divs and adds max width to longer names. --- apps/files/css/detailsView.css | 15 +++++++++++++++ apps/files/js/detailsview.js | 17 ++++++----------- apps/files/js/mainfileinfodetailview.js | 19 +++++++++++-------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css index dafd8c24573..ffead923124 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.css @@ -9,11 +9,20 @@ #app-sidebar .mainFileInfoView { margin-right: 20px; /* accomodate for close icon */ + float:left; + display:block; + width: 100%; +} + +#app-sidebar .file-details-container { + display: inline-block; + float: left; } #app-sidebar .thumbnail { width: 75px; height: 75px; + display: inline-block; float: left; margin-right: 10px; background-size: 75px; @@ -31,10 +40,16 @@ padding-bottom: 3px; } +#app-sidebar .fileName h3 { + max-width: 300px; + float:left; +} + #app-sidebar .file-details { margin-top: 3px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; + float:left; } #app-sidebar .action-favorite { vertical-align: text-bottom; diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js index a4ebe90cd64..83d7fd4a178 100644 --- a/apps/files/js/detailsview.js +++ b/apps/files/js/detailsview.js @@ -10,24 +10,20 @@ (function() { var TEMPLATE = - '
' + '
' + '
' + - '
' + - ' {{#if tabHeaders}}' + - '
    ' + + ' {{#if tabHeaders}}' + + '
      ' + ' {{#each tabHeaders}}' + '
    • ' + ' {{label}}' + '
    • ' + ' {{/each}}' + - '
    ' + - ' {{/if}}' + - '
    ' + - '
    ' + + '
' + + ' {{/if}}' + + '
' + '
' + - ' ' + - '
'; + ' '; /** * @class OCA.Files.DetailsView @@ -268,4 +264,3 @@ OCA.Files.DetailsView = DetailsView; })(); - diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 513f833299a..f647a0de2a9 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -10,14 +10,17 @@ (function() { var TEMPLATE = - '
{{name}}
' + - '
' + - ' ' + - ' ' + - ' ' + - ' {{#if hasSize}}{{size}}, {{/if}}{{date}}' + + '' + + '
' + + '

{{name}}

' + + '
' + + ' ' + + ' ' + + ' ' + + ' {{#if hasSize}}{{size}}, {{/if}}{{date}}' + + '
' + '
'; /**