From e3d19a9175aa204b3091647dc4229d4971b1bd62 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 29 Aug 2013 03:15:31 +0200 Subject: [PATCH] Updates. --- src/_h5ai/client/css/inc/view-details.less | 12 ++++++------ src/_h5ai/client/css/inc/view-grid.less | 14 +++++++------- src/_h5ai/client/css/inc/view-icons.less | 11 ++++++----- src/_h5ai/client/css/inc/view.less | 3 +-- src/_h5ai/client/images/view-list.svg | 11 ----------- src/_h5ai/client/js/inc/view/spacing.js | 4 ++-- 6 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 src/_h5ai/client/images/view-list.svg diff --git a/src/_h5ai/client/css/inc/view-details.less b/src/_h5ai/client/css/inc/view-details.less index 2348cf3c..97dbe45c 100644 --- a/src/_h5ai/client/css/inc/view-details.less +++ b/src/_h5ai/client/css/inc/view-details.less @@ -12,7 +12,7 @@ a, a:active, a:visited { border-top: 1px solid @item-border-col-sep; border-bottom: 1px solid @item-border-col-sep; - height: @small-icon-size + 6px; + height: @icon-size + 6px; &:hover, &.hover { border-color: @item-border-col-hover; @@ -24,7 +24,7 @@ padding: 8px; } .label, .date, .size { - padding: ((@small-icon-size - 16px)/2) 8px; + padding: ((@icon-size - 16px)/2) 8px; } } @@ -40,16 +40,16 @@ position: absolute; left: 0; top: -5px; - width: @small-icon-size; + width: @icon-size; img { - width: @small-icon-size; - height: @small-icon-size; + width: @icon-size; + height: @icon-size; } } .label { - margin: 0 230px 0 (@small-icon-size + 16px); + margin: 0 230px 0 (@icon-size + 16px); } .date { diff --git a/src/_h5ai/client/css/inc/view-grid.less b/src/_h5ai/client/css/inc/view-grid.less index 225edad0..4a67e115 100644 --- a/src/_h5ai/client/css/inc/view-grid.less +++ b/src/_h5ai/client/css/inc/view-grid.less @@ -9,8 +9,8 @@ a, a:active, a:visited { float: left; margin: 2px; - width: @small-icon-size + 186px; - height: @small-icon-size + 6px; + width: @icon-size + 186px; + height: @icon-size + 6px; border: 1px solid rgba(0,0,0,0); &:hover, &.hover { @@ -23,7 +23,7 @@ padding: 8px; } .label, .date, .size { - padding: ((@small-icon-size - 16px)/2) 8px; + padding: ((@icon-size - 16px)/2) 8px; } } @@ -32,17 +32,17 @@ position: absolute; left: 0; top: -2px; - width: @small-icon-size; + width: @icon-size; img { - width: @small-icon-size; - height: @small-icon-size; + width: @icon-size; + height: @icon-size; } } .label { display: block; - margin: 0 0 0 (@small-icon-size + 8px); + margin: 0 0 0 (@icon-size + 8px); } .date, .size { diff --git a/src/_h5ai/client/css/inc/view-icons.less b/src/_h5ai/client/css/inc/view-icons.less index a5f48cea..44b104dd 100644 --- a/src/_h5ai/client/css/inc/view-icons.less +++ b/src/_h5ai/client/css/inc/view-icons.less @@ -11,8 +11,9 @@ float: left; margin: 8px; padding: 8px; - width: @big-icon-size * 2; - height: @big-icon-size + 72px; + min-width: 96px; + width: @icon-size * 2; + height: @icon-size + 72px; border: 1px solid rgba(0,0,0,0); &:hover, &.hover { @@ -23,12 +24,12 @@ .icon.rational { display: block; - height: @big-icon-size; + height: @icon-size; margin-bottom: 6px; img { - max-width: @big-icon-size * 2; - max-height: @big-icon-size; + max-width: @icon-size * 2; + max-height: @icon-size; } } diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index c26bd130..ee71d8ea 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -56,8 +56,7 @@ @item-background-col-sel: rgba(0,0,0,0.02); @item-border-col-sel: @col-border-strong; -@small-icon-size: 32px; -@big-icon-size: 48px; +@icon-size: 48px; #view { diff --git a/src/_h5ai/client/images/view-list.svg b/src/_h5ai/client/images/view-list.svg deleted file mode 100644 index 4079bd01..00000000 --- a/src/_h5ai/client/images/view-list.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/src/_h5ai/client/js/inc/view/spacing.js b/src/_h5ai/client/js/inc/view/spacing.js index 98fd353f..805752ce 100644 --- a/src/_h5ai/client/js/inc/view/spacing.js +++ b/src/_h5ai/client/js/inc/view/spacing.js @@ -4,9 +4,9 @@ modulejs.define('view/spacing', ['_', '$', 'core/settings', 'core/event'], funct var settings = _.extend({ maxWidth: 960, top: 50, - right: "auto", + right: 'auto', bottom: 50, - left: "auto" + left: 'auto' }, allsettings.spacing), adjustSpacing = function () {