From f89010bd98b108eaa322ad93f356337d3dfaf458 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 26 Apr 2015 23:41:07 +0200 Subject: [PATCH] Refactor styles. --- src/_h5ai/client/css/inc/ext/select.less | 52 +++++++++++++++++++ .../{core/root-info.less => main/info.less} | 0 .../css/inc/{core => view}/content.less | 0 .../css/inc/{core => view}/fallback.less | 0 .../css/inc/{core => view}/mainrow.less | 0 .../client/css/inc/{core => view}/notify.less | 0 .../client/css/inc/{core => view}/root.less | 0 .../css/inc/{core => view}/sidebar.less | 0 .../client/css/inc/{core => view}/topbar.less | 0 .../css/inc/{core => view}/view-details.less | 0 .../css/inc/{core => view}/view-grid.less | 0 .../css/inc/{core => view}/view-icons.less | 0 .../client/css/inc/{core => view}/view.less | 44 +--------------- src/_h5ai/client/css/styles.less | 3 +- 14 files changed, 54 insertions(+), 45 deletions(-) rename src/_h5ai/client/css/inc/{core/root-info.less => main/info.less} (100%) rename src/_h5ai/client/css/inc/{core => view}/content.less (100%) rename src/_h5ai/client/css/inc/{core => view}/fallback.less (100%) rename src/_h5ai/client/css/inc/{core => view}/mainrow.less (100%) rename src/_h5ai/client/css/inc/{core => view}/notify.less (100%) rename src/_h5ai/client/css/inc/{core => view}/root.less (100%) rename src/_h5ai/client/css/inc/{core => view}/sidebar.less (100%) rename src/_h5ai/client/css/inc/{core => view}/topbar.less (100%) rename src/_h5ai/client/css/inc/{core => view}/view-details.less (100%) rename src/_h5ai/client/css/inc/{core => view}/view-grid.less (100%) rename src/_h5ai/client/css/inc/{core => view}/view-icons.less (100%) rename src/_h5ai/client/css/inc/{core => view}/view.less (60%) diff --git a/src/_h5ai/client/css/inc/ext/select.less b/src/_h5ai/client/css/inc/ext/select.less index 3d0400be..7f98d558 100644 --- a/src/_h5ai/client/css/inc/ext/select.less +++ b/src/_h5ai/client/css/inc/ext/select.less @@ -18,3 +18,55 @@ html.drag-select, html.drag-select * { -ms-user-select: none; user-select: none; } + +#view { + + .selector { + display: none; + position: absolute; + left: 0; + top: 0; + width: 22px; + height: 22px; + background: @col-back-selected; + cursor: pointer; + border-radius: 0 0 2px 0; + opacity: 0.6; + + &:hover { + opacity: 0.8; + } + img { + width: 100%; + height: 100%; + } + } + + .item:hover .selector { + display: block; + } + + .item.selected:not(.selecting), + .item.selecting:not(.selected) { + color: @col-text-selected; + background: @col-back-selected; + + .selector { + display: block; + opacity: 1; + } + &:hover { + color: @col-text-selected; + background: @col-back-selected; + } + } + + .no-match { + display: none; + margin-top: 36px; + text-align: center; + color: @col-border; + font-size: 5em; + font-weight: bold; + } +} diff --git a/src/_h5ai/client/css/inc/core/root-info.less b/src/_h5ai/client/css/inc/main/info.less similarity index 100% rename from src/_h5ai/client/css/inc/core/root-info.less rename to src/_h5ai/client/css/inc/main/info.less diff --git a/src/_h5ai/client/css/inc/core/content.less b/src/_h5ai/client/css/inc/view/content.less similarity index 100% rename from src/_h5ai/client/css/inc/core/content.less rename to src/_h5ai/client/css/inc/view/content.less diff --git a/src/_h5ai/client/css/inc/core/fallback.less b/src/_h5ai/client/css/inc/view/fallback.less similarity index 100% rename from src/_h5ai/client/css/inc/core/fallback.less rename to src/_h5ai/client/css/inc/view/fallback.less diff --git a/src/_h5ai/client/css/inc/core/mainrow.less b/src/_h5ai/client/css/inc/view/mainrow.less similarity index 100% rename from src/_h5ai/client/css/inc/core/mainrow.less rename to src/_h5ai/client/css/inc/view/mainrow.less diff --git a/src/_h5ai/client/css/inc/core/notify.less b/src/_h5ai/client/css/inc/view/notify.less similarity index 100% rename from src/_h5ai/client/css/inc/core/notify.less rename to src/_h5ai/client/css/inc/view/notify.less diff --git a/src/_h5ai/client/css/inc/core/root.less b/src/_h5ai/client/css/inc/view/root.less similarity index 100% rename from src/_h5ai/client/css/inc/core/root.less rename to src/_h5ai/client/css/inc/view/root.less diff --git a/src/_h5ai/client/css/inc/core/sidebar.less b/src/_h5ai/client/css/inc/view/sidebar.less similarity index 100% rename from src/_h5ai/client/css/inc/core/sidebar.less rename to src/_h5ai/client/css/inc/view/sidebar.less diff --git a/src/_h5ai/client/css/inc/core/topbar.less b/src/_h5ai/client/css/inc/view/topbar.less similarity index 100% rename from src/_h5ai/client/css/inc/core/topbar.less rename to src/_h5ai/client/css/inc/view/topbar.less diff --git a/src/_h5ai/client/css/inc/core/view-details.less b/src/_h5ai/client/css/inc/view/view-details.less similarity index 100% rename from src/_h5ai/client/css/inc/core/view-details.less rename to src/_h5ai/client/css/inc/view/view-details.less diff --git a/src/_h5ai/client/css/inc/core/view-grid.less b/src/_h5ai/client/css/inc/view/view-grid.less similarity index 100% rename from src/_h5ai/client/css/inc/core/view-grid.less rename to src/_h5ai/client/css/inc/view/view-grid.less diff --git a/src/_h5ai/client/css/inc/core/view-icons.less b/src/_h5ai/client/css/inc/view/view-icons.less similarity index 100% rename from src/_h5ai/client/css/inc/core/view-icons.less rename to src/_h5ai/client/css/inc/view/view-icons.less diff --git a/src/_h5ai/client/css/inc/core/view.less b/src/_h5ai/client/css/inc/view/view.less similarity index 60% rename from src/_h5ai/client/css/inc/core/view.less rename to src/_h5ai/client/css/inc/view/view.less index bf999182..add07dee 100644 --- a/src/_h5ai/client/css/inc/core/view.less +++ b/src/_h5ai/client/css/inc/view/view.less @@ -28,26 +28,6 @@ &:hover { color: @col-text-hover; background: @col-back-panel; - border-color: @col-border; - - .selector { - display: block; - } - } - - &.selected:not(.selecting), &.selecting:not(.selected) { - color: @col-text-selected; - background: @col-back-selected; - - &:hover { - color: @col-text-selected; - background: @col-back-selected; - } - - .selector { - display: block; - opacity: 1; - } } } @@ -93,29 +73,7 @@ width: 80px; } - .selector { - display: none; - position: absolute; - left: 0; - top: 0; - width: 22px; - height: 22px; - background: @col-back-selected; - cursor: pointer; - border-radius: 0 0 2px 0; - opacity: 0.6; - - &:hover { - opacity: 0.8; - } - - img { - width: 100%; - height: 100%; - } - } - - .empty, .no-match { + .empty { display: none; margin-top: 36px; text-align: center; diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 5f2577d6..57d4d0a5 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -8,8 +8,7 @@ // @include "inc/misc.less" // @include "inc/mixins.less" -// @include "inc/core/*.less" -// @include "inc/ext/*.less" +// @include "inc/*/*.less" // @include "inc/responsive.less"