diff --git a/src/_h5ai/client/css/inc/content.less b/src/_h5ai/client/css/inc/content.less index 88ad1f8e..6e4214ed 100644 --- a/src/_h5ai/client/css/inc/content.less +++ b/src/_h5ai/client/css/inc/content.less @@ -1,4 +1,3 @@ - #content { overflow: auto; flex: 1 1 auto; diff --git a/src/_h5ai/client/css/inc/contextmenu.less b/src/_h5ai/client/css/inc/contextmenu.less index c2bf0a7d..631b941a 100644 --- a/src/_h5ai/client/css/inc/contextmenu.less +++ b/src/_h5ai/client/css/inc/contextmenu.less @@ -1,5 +1,4 @@ - -.cm-overlay { +#cm-overlay { display: none; position: fixed; left: 0; @@ -10,68 +9,67 @@ z-index: 200; // background: rgba(0,0,0,0.1); // background: rgba(255,255,255,0.6); -} + .cm-panel { + .popup(); + .rounded(); + display: block; + position: absolute; + left: 100px; + top: 100px; + background: #fff; + color: @col; + z-index: 10; + overflow: auto; + min-width: 200px; -.cm-panel { - .popup(); - .rounded(); - display: block; - position: absolute; - left: 100px; - top: 100px; - background: #fff; - color: @col; - z-index: 10; - overflow: auto; - min-width: 200px; - - ul { - margin: 0; - padding: 0; - list-style: none; - text-align: left; - - .cm-label { - padding: 8px 16px; - white-space: nowrap; - font-weight: bold; - } - - .cm-entry { - padding: 8px 16px; - white-space: nowrap; - cursor: pointer; - - &:hover { - color: @col-hover; - background: @col-darkgray; - } - - .cm-icon { - position: relative; - top: -2px; - - img { - width: 20px; - height: 20px; - } - - &.no-icon { - opacity: 0; - } - } - - .cm-text { - margin: 0 0 0 12px; - } - } - - .cm-sep { - height: 1px; - margin: 8px 0; + ul { + margin: 0; padding: 0; - border-top: 1px solid rgba(0,0,0,0.08); + list-style: none; + text-align: left; + + .cm-label { + padding: 8px 16px; + white-space: nowrap; + font-weight: bold; + } + + .cm-entry { + padding: 8px 16px; + white-space: nowrap; + cursor: pointer; + + &:hover { + color: @col-hover; + background: @col-darkgray; + } + + .cm-icon { + position: relative; + top: -2px; + + img { + width: 20px; + height: 20px; + } + + &.no-icon { + opacity: 0; + } + } + + .cm-text { + margin: 0 0 0 12px; + } + } + + .cm-sep { + height: 1px; + margin: 8px 0; + padding: 0; + border-top: 1px solid rgba(0,0,0,0.08); + } } } } diff --git a/src/_h5ai/client/css/inc/crumb.less b/src/_h5ai/client/css/inc/crumb.less index c170c637..a5e484d6 100644 --- a/src/_h5ai/client/css/inc/crumb.less +++ b/src/_h5ai/client/css/inc/crumb.less @@ -23,7 +23,7 @@ } .crumb { display: inline-block; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; } .sep { width: 24px; diff --git a/src/_h5ai/client/css/inc/download.less b/src/_h5ai/client/css/inc/download.less index fd09199b..492028e2 100644 --- a/src/_h5ai/client/css/inc/download.less +++ b/src/_h5ai/client/css/inc/download.less @@ -1,4 +1,3 @@ - #download { display: none; diff --git a/src/_h5ai/client/css/inc/fallback.less b/src/_h5ai/client/css/inc/fallback.less index 6ff6b4db..90cd03ce 100644 --- a/src/_h5ai/client/css/inc/fallback.less +++ b/src/_h5ai/client/css/inc/fallback.less @@ -1,4 +1,3 @@ - #fallback { display: none; max-width: 960px; @@ -59,7 +58,6 @@ } } - #fallback-hints { display: none; overflow: hidden; @@ -72,7 +70,7 @@ line-height: 48px; color: @col-text-secondary-black; text-decoration: none; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; outline: 0; &:hover { @@ -90,7 +88,6 @@ } } - html.no-js, html.no-browser { body { diff --git a/src/_h5ai/client/css/inc/filter.less b/src/_h5ai/client/css/inc/filter.less index 6c82c284..5b41c36f 100644 --- a/src/_h5ai/client/css/inc/filter.less +++ b/src/_h5ai/client/css/inc/filter.less @@ -1,4 +1,3 @@ - #filter { input { diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 064f86e3..c0b250d3 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -77,17 +77,6 @@ ::-moz-selection { background: @col-pink-a200; color: @col-text-primary-white; text-shadow: none; } ::selection { background: @col-pink-a200; color: @col-text-primary-white; text-shadow: none; } -.transition (@transition) { - -webkit-transition: @transition; - transition: @transition; -} - -.transform (@transform) { - -webkit-transform: @transform; - -ms-transform: @transform; - transform: @transform; - zoom: 1; -} .card() { box-shadow: 0 1px 1px 0 rgba(0,0,0,0.2); @@ -109,7 +98,7 @@ .el-button() { .card(); .rounded(); - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; color: @col-text-primary-white; background: @col-blue-400; border-radius: 2px; diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 274e06bd..0dbed8a6 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -1,5 +1,4 @@ - -body#h5ai-info { +#h5ai-info { #content { flex: 1 1 auto; @@ -25,7 +24,7 @@ body#h5ai-info { margin: 0.8em 0 0 0; color: @col-text-primary-black; text-decoration: none; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; &:hover { color: @col-hover; diff --git a/src/_h5ai/client/css/inc/info.less b/src/_h5ai/client/css/inc/info.less index 0f5a3253..faa2344a 100644 --- a/src/_h5ai/client/css/inc/info.less +++ b/src/_h5ai/client/css/inc/info.less @@ -1,4 +1,3 @@ - #info { display: none; diff --git a/src/_h5ai/client/css/inc/notify.less b/src/_h5ai/client/css/inc/notify.less index 879c8098..2d2bcd03 100644 --- a/src/_h5ai/client/css/inc/notify.less +++ b/src/_h5ai/client/css/inc/notify.less @@ -1,4 +1,3 @@ - #notify { position: fixed; left: 50%; diff --git a/src/_h5ai/client/css/inc/preview-aud.less b/src/_h5ai/client/css/inc/preview-aud.less index fb6478c6..0a91798a 100644 --- a/src/_h5ai/client/css/inc/preview-aud.less +++ b/src/_h5ai/client/css/inc/preview-aud.less @@ -1,4 +1,3 @@ - #pv-aud-audio { position: absolute; diff --git a/src/_h5ai/client/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less index 312ce0ca..5978164f 100644 --- a/src/_h5ai/client/css/inc/preview-img.less +++ b/src/_h5ai/client/css/inc/preview-img.less @@ -1,7 +1,8 @@ - -@check-white: #f8f8f8; -@check-black: #e8e8e8; #pv-img-image { + + @check-white: #f8f8f8; + @check-black: #e8e8e8; + position: absolute; max-width: 100%; diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index 7d4ba852..61b01165 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -1,4 +1,3 @@ - #pv-txt-text { max-width: 960px; text-align: left; @@ -92,7 +91,6 @@ } } - &.markdown { font-size: 1.1em; padding: 8px 24px; diff --git a/src/_h5ai/client/css/inc/preview-vid.less b/src/_h5ai/client/css/inc/preview-vid.less index 4d5ad0b9..43f8a5c5 100644 --- a/src/_h5ai/client/css/inc/preview-vid.less +++ b/src/_h5ai/client/css/inc/preview-vid.less @@ -1,4 +1,3 @@ - #pv-vid-video { position: absolute; diff --git a/src/_h5ai/client/css/inc/preview.less b/src/_h5ai/client/css/inc/preview.less index ddf8ca13..ee13b4fb 100644 --- a/src/_h5ai/client/css/inc/preview.less +++ b/src/_h5ai/client/css/inc/preview.less @@ -1,4 +1,3 @@ - #pv-overlay { display: none; position: fixed; @@ -9,7 +8,7 @@ z-index: 100; background-color: rgba(0,0,0,0.5); - .transition(background-color 0.3s ease-in-out); + transition: background-color 0.3s ease-in-out; text-align: center; } @@ -53,7 +52,7 @@ margin: -36px 0; padding: 12px; opacity: 0.5; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; } &:hover { @@ -101,7 +100,7 @@ line-height: 48px; padding: 0 12px; opacity: 0.7; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; } .bar-button { @@ -109,7 +108,7 @@ line-height: 48px; opacity: 0.7; cursor: pointer; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; &:hover { opacity: 1.0; @@ -146,7 +145,7 @@ } @media only screen and (max-width: 700px) { -#pv-prev-area, #pv-next-area { - display: none !important; -} + #pv-prev-area, #pv-next-area { + display: none !important; + } } diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index 1d025172..a38c4c4c 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -1,4 +1,3 @@ - @media only screen and (max-width: 700px) { #crumbbar { .crumb:not(.active) { diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less index 811da127..806634c6 100644 --- a/src/_h5ai/client/css/inc/sidebar.less +++ b/src/_h5ai/client/css/inc/sidebar.less @@ -1,4 +1,3 @@ - #sidebar { display: none; overflow: auto; @@ -25,7 +24,7 @@ border-radius: 2px; color: @col; cursor: pointer; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; &:hover { background: rgba(0,0,0,0.03); diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index a09ce19e..bb3a6eb3 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -15,7 +15,6 @@ z-index: 1; } - #toolbar { overflow: hidden; flex: 0 0 auto; @@ -25,7 +24,7 @@ .tool { display: inline-block; cursor: pointer; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; img { display: inline-block; @@ -40,7 +39,6 @@ } } - #flowbar { overflow: hidden; flex: 1 1 auto; @@ -49,7 +47,6 @@ font-size: 16px; } - #backlink { display: block; overflow: hidden; @@ -59,7 +56,7 @@ padding: 6px 12px; overflow: hidden; height: 36px; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; &, &:active, &:visited { color: @col-text-disabled-black; diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 1f7c5366..fd90b0cd 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -1,4 +1,3 @@ - #tree { display: none; @@ -40,11 +39,12 @@ img { width: 20px; height: 20px; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; } &.open { img { - .transform(rotate(90deg)); + transform: rotate(90deg); + zoom: 1; } } &.unknown { diff --git a/src/_h5ai/client/css/inc/view-details.less b/src/_h5ai/client/css/inc/view-details.less index 92780747..621f387d 100644 --- a/src/_h5ai/client/css/inc/view-details.less +++ b/src/_h5ai/client/css/inc/view-details.less @@ -1,30 +1,28 @@ +#view.view-details { -.view-details-sized(@size) { + .view-details-sized(@size) { - .item { - .label, .date, .size { - line-height: @size + 14px; + .item { + .label, .date, .size { + line-height: @size + 14px; + } } - } - .square { - width: @size; - height: @size; - - img { + .square { width: @size; height: @size; + + img { + width: @size; + height: @size; + } + } + + .label { + margin: 0 246px 0 (@size + 32px); } } - .label { - margin: 0 246px 0 (@size + 32px); - } -} - - -#view.view-details { - margin: 16px; #items { @@ -44,7 +42,7 @@ line-height: 46px; opacity: 0.4; outline: 0; - .transition(all 0.2s ease-in-out); + transition: all 0.2s ease-in-out; &:hover { opacity: 1; @@ -67,7 +65,8 @@ .descending .sort { display: inline; - .transform(rotate(180deg)); + transform: rotate(180deg); + zoom: 1; } } diff --git a/src/_h5ai/client/css/inc/view-grid.less b/src/_h5ai/client/css/inc/view-grid.less index 657281be..bf19aad9 100644 --- a/src/_h5ai/client/css/inc/view-grid.less +++ b/src/_h5ai/client/css/inc/view-grid.less @@ -1,23 +1,21 @@ +#view.view-grid { -.view-grid-sized(@size) { + .view-grid-sized(@size) { - .label { - line-height: @size; - } + .label { + line-height: @size; + } - .square { - width: @size; - height: @size; - - img { + .square { width: @size; height: @size; + + img { + width: @size; + height: @size; + } } } -} - - -#view.view-grid { margin: 8px; diff --git a/src/_h5ai/client/css/inc/view-icons.less b/src/_h5ai/client/css/inc/view-icons.less index 0d546120..e71e2c90 100644 --- a/src/_h5ai/client/css/inc/view-icons.less +++ b/src/_h5ai/client/css/inc/view-icons.less @@ -1,27 +1,25 @@ +#view.view-icons { -.view-icons-sized(@size) { + .view-icons-sized(@size) { - .item { - width: @size * 4/3; - } - - .landscape { - width: @size * 4/3; - height: @size; - - img { - width: @size; - height: @size; - } - - .thumb { + .item { width: @size * 4/3; } + + .landscape { + width: @size * 4/3; + height: @size; + + img { + width: @size; + height: @size; + } + + .thumb { + width: @size * 4/3; + } + } } -} - - -#view.view-icons { margin: 8px; diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index ba624b44..4b71f832 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -1,5 +1,3 @@ - - html.drag-select, html.drag-select * { cursor: move !important; @@ -11,7 +9,6 @@ html.drag-select, html.drag-select * { user-select: none; } - #selection-rect { display: none; position: absolute; @@ -22,7 +19,6 @@ html.drag-select, html.drag-select * { background: rgba(0,0,0,0.1); } - #view { display: none; diff --git a/src/_h5ai/client/js/inc/ext/contextmenu.js b/src/_h5ai/client/js/inc/ext/contextmenu.js index df40580c..d0174d38 100644 --- a/src/_h5ai/client/js/inc/ext/contextmenu.js +++ b/src/_h5ai/client/js/inc/ext/contextmenu.js @@ -3,7 +3,7 @@ modulejs.define('ext/contextmenu', ['_', '$', 'core/resource', 'core/settings'], var settings = _.extend({ enabled: false }, allsettings.contextmenu); - var templateOverlay = '
'; + var templateOverlay = ''; var templatePanel = '