From 37ca5ff84e408052e6e69033f60ee0385daf0d6c Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Fri, 23 Mar 2018 11:29:10 +0100 Subject: [PATCH] #208: overflow menu on files --- .../src/partial/docs/document.default.html | 15 +++-- .../partial/docs/document.view.content.html | 29 ++++++--- docs-web/src/main/webapp/src/style/main.less | 59 ++++++++++++------- 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html index 8b54e1b7..d101bca8 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.default.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html @@ -9,18 +9,17 @@ ngf-allow-dir="false">
- + - -
-
- -
-
+
+
{{ file.name }}
+
-
+
+ +
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html index de675d74..8b3dc182 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html @@ -44,24 +44,37 @@ ngf-allow-dir="false">
-
+
- + - -
-
+ +
+
{{ file.name }}
+
-
- + +
+
+ + +
-
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less index 3172d965..779bfa70 100644 --- a/docs-web/src/main/webapp/src/style/main.less +++ b/docs-web/src/main/webapp/src/style/main.less @@ -187,16 +187,46 @@ ul.tag-tree { // File thumbnails .thumbnail { - a { + .file-processing-indicator { + position: absolute; + z-index: 2; + margin-left: 8px; + margin-top: 8px; + color: #2ab2dc; + } + + a.file-thumbnail { height: 200px; display: block; overflow: hidden; background: #eee; } - .caption { - height: 60px; - overflow: hidden; + .file-name { + word-wrap: break-word; + white-space: normal; + display: block; + text-overflow: ellipsis; + } + + .file-info { + display: flex; + justify-content: space-between; + + .caption { + height: 42px; + padding: 0; + margin: 9px; + } + + .v-align { + display: flex; + align-items: center; + + > * { + margin-right: 8px; + } + } } input[type="checkbox"] { @@ -217,11 +247,13 @@ ul.tag-tree { .caption-hover-inverse { display: block; + overflow: hidden; } &:hover { .caption-hover { - display: block; + display: flex; + align-items: center; } .caption-hover-inverse { @@ -230,22 +262,6 @@ ul.tag-tree { } } -// File processing indicator -.file-processing-indicator { - position: absolute; - z-index: 2; - margin-left: 8px; - margin-top: 8px; - color: #2ab2dc; -} - -// File name -.file-name { - word-wrap: break-word; - white-space: normal; - display: block; -} - // Permissions table .table-permissions { .label-acl { @@ -670,7 +686,6 @@ input[readonly].share-link { box-shadow: 0 7px 14px 0 rgba(50,50,93,.1), 0 3px 6px 0 rgba(0,0,0,.07); background: none; border-radius: 4px; - overflow: hidden; .well-3d-header { font-size: 20px;