diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index a96cb995..2c43a33b 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -1,6 +1,7 @@ @col: rgb(85,85,85); -@col-back: rgb(255,255,255); +// @col-back: rgb(255,255,255); +@col-back: rgb(245,245,245); @col-hover: rgb(29,119,194); @col-border: rgba(0,0,0,0.05); @col-border-strong: rgba(0,0,0,0.15); diff --git a/src/_h5ai/client/css/inc/view-details.less b/src/_h5ai/client/css/inc/view-details.less index 4c141e44..5f8f00c8 100644 --- a/src/_h5ai/client/css/inc/view-details.less +++ b/src/_h5ai/client/css/inc/view-details.less @@ -6,11 +6,11 @@ &.item { a, a:active, a:visited { - height: @size + 6px; + height: @size + 14px; } .label, .date, .size { - padding: ((@size - 16px)/2) 8px; + padding: ((@size - 4px)/2) 8px; } } @@ -39,6 +39,7 @@ } &.item { + background: #fff; a, a:active, a:visited { border-bottom: 1px solid @item-border-col-sep; @@ -58,7 +59,7 @@ display: inline-block; position: absolute; left: 0; - top: -4px; + top: -1px; } .date { diff --git a/src/_h5ai/client/css/inc/view-grid.less b/src/_h5ai/client/css/inc/view-grid.less index c5adebbf..6a47438d 100644 --- a/src/_h5ai/client/css/inc/view-grid.less +++ b/src/_h5ai/client/css/inc/view-grid.less @@ -7,11 +7,11 @@ a, a:active, a:visited { width: @size + 182px; - height: @size + 6px; + height: @size + 14px; } .label, .date, .size { - padding: ((@size - 16px)/2) 8px; + padding: ((@size - 4px)/2) 8px; } } @@ -38,6 +38,7 @@ &.item { float: left; margin: 2px; + background: #fff; a, a:active, a:visited { border: 1px solid rgba(0,0,0,0); @@ -57,7 +58,6 @@ display: inline-block; position: absolute; left: 0; - top: -4px; } .label { diff --git a/src/_h5ai/client/css/inc/view-icons.less b/src/_h5ai/client/css/inc/view-icons.less index 623b5995..075de1c4 100644 --- a/src/_h5ai/client/css/inc/view-icons.less +++ b/src/_h5ai/client/css/inc/view-icons.less @@ -6,10 +6,8 @@ &.item { a, a:active, a:visited { - // width: @size * 2; - // height: @size + 72px; width: @size * 4/3; - height: @size + 22px; + height: @size + 28px; } } @@ -20,11 +18,10 @@ width: @size; height: @size; } - img.thumb { - width: auto; - height: auto; - max-width: @size * 2; - max-height: @size; + + .thumb { + width: @size * 4/3; + height: @size; } } } @@ -38,11 +35,10 @@ &.item { float: left; - margin: 8px; + margin: 2px; a, a:active, a:visited { padding: 8px; - min-width: 96px; border: 1px solid rgba(0,0,0,0); &:hover, &.hover { @@ -57,9 +53,7 @@ } .label { - text-align: center; - // word-wrap: break-word; - // white-space: normal; + padding: 0 8px; } .date, .size { diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index 41757bf8..7c944282 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -73,7 +73,8 @@ } &.item { - font-size: 15px; + // font-size: 15px; + font-size: 13px; a, a:active, a:visited { display: block; @@ -128,17 +129,18 @@ img { vertical-align: top; + max-width: 64px; } .thumb { - box-shadow: 0 0 0 1px rgba(0,0,0,0.06); + max-width: none; } &.rational { - .thumb { - // padding: 2px; - // border-radius: 3px; - } + border-radius: 1px; + background: #fff; + overflow: hidden; + box-shadow: 0 1px rgba(0,0,0,0.1), 1px 0 rgba(0,0,0,0.02), -1px 0 rgba(0,0,0,0.02); } } diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index e16fe8ae..4281d9c0 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -23,7 +23,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c var $view = $('#view'); var itemWidth = ($view.hasClass('view-icons') || $view.hasClass('view-grid')) ? ($view.find('.item').eq(0).outerWidth(true) || 1) : 1; - $view.width(Math.floor(contentWidth / itemWidth) * itemWidth); + $view.width(Math.floor(contentWidth / itemWidth) * itemWidth + 4); } function update(mode, size) { diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 59a1cf90..1fd9c342 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -52,7 +52,7 @@ Options "hideParentFolder": false, "modes": ["details", "grid", "icons"], "setParentFolderLabels": true, - "sizes": [24, 32, 48, 64, 96, 128], + "sizes": [24, 32, 48, 64, 96, 128, 192, 256, 384], "smartBrowsing": true, "theme": "", "unmanaged": ["index.html", "index.htm", "index.php"], @@ -331,7 +331,7 @@ Options "mov": ["vid-avi", "vid-flv", "vid-mkv", "vid-mov", "vid-mp4", "vid-mpg", "vid-webm"], "doc": ["x-pdf", "x-ps"], "delay": 1, - "size": 128, + "size": 256, "exif": true },