From bb1d503f3e4f15b77d735f0a288356e0b815e997 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 04:10:55 +0100 Subject: [PATCH 1/3] Add icon to Versions sidebar tab Signed-off-by: Jan-Christoph Borchardt --- apps/files_versions/js/versionstabview.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js index 61309a30d5..213ee1ae83 100644 --- a/apps/files_versions/js/versionstabview.js +++ b/apps/files_versions/js/versionstabview.js @@ -38,6 +38,10 @@ return t('files_versions', 'Versions'); }, + getIcon: function() { + return 'icon-history'; + }, + nextPage: function() { if (this._loading) { return; From 4e12132e43e679a0129e16a1a9019bfc332be5c9 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 04:11:20 +0100 Subject: [PATCH 2/3] Fix issues with clipboard button for local link in sidebar Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/detailsView.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss index f64a370285..71062648c9 100644 --- a/apps/files/css/detailsView.scss +++ b/apps/files/css/detailsView.scss @@ -15,7 +15,13 @@ #app-sidebar .mainFileInfoView .permalink { padding: 6px 10px; - vertical-align: text-top; + vertical-align: top; + opacity: .6; + + &:hover, + &:focus { + opacity: 1; + } } #app-sidebar .mainFileInfoView .permalink-field>input { clear: both; @@ -87,7 +93,7 @@ } #app-sidebar .fileName h3 { - width: calc(100% - 36px); /* 36px is the with of the copy link icon */ + width: calc(100% - 42px); /* 36px is the with of the copy link icon, but this breaks so we add some more to be sure */ display: inline-block; padding: 5px 0; margin: -5px 0; From c0aee3f1a11188e862e8715b8a3a1a51259b333f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 04:16:56 +0100 Subject: [PATCH 3/3] Fix design of tabs in sidebar Signed-off-by: Jan-Christoph Borchardt --- core/css/apps.scss | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 8b94d08ce2..54372afa45 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -781,27 +781,47 @@ kbd { /* TABS ------------------------------------------------------------ */ .tabHeaders { - display: inline-block; - margin: 15px; + display: flex; + margin-bottom: 16px; + .tabHeader { - float: left; - padding: 12px; + display: flex; + flex-direction: column; + flex-grow: 1; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; cursor: pointer; color: var(--color-text-lighter); margin-bottom: 1px; + padding: 5px; + + /* Use same amount as sidebar padding */ + &:first-child { + padding-left: 15px; + } + &:last-child { + padding-right: 15px; + } + .icon { display: inline-block; - width: 16px; + width: 100%; height: 16px; background-size: 16px; vertical-align: middle; margin-top: -2px; margin-right: 3px; opacity: .7; + cursor: pointer; } + a { color: var(--color-text-lighter); margin-bottom: 1px; + overflow: hidden; + text-overflow: ellipsis; } &.selected { font-weight: bold;