aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-01 12:42:03 +0100
committerGitHub <noreply@github.com>2018-11-01 12:42:03 +0100
commitbfab6ccf1bcce9e778721e7e9e63cc8b315db298 (patch)
treefe2415ecf32ebe519db8b29b1d74638a0d88552e /apps
parent0a61242c8520a5261a8f239be90998b7682a7214 (diff)
parentc0aee3f1a11188e862e8715b8a3a1a51259b333f (diff)
downloadnextcloud-server-bfab6ccf1bcce9e778721e7e9e63cc8b315db298.tar.gz
nextcloud-server-bfab6ccf1bcce9e778721e7e9e63cc8b315db298.zip
Merge pull request #12180 from nextcloud/sidebar-fixes
Sidebar fixes, mostly fixing design of tabs
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/detailsView.scss10
-rw-r--r--apps/files_versions/js/versionstabview.js4
2 files changed, 12 insertions, 2 deletions
diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss
index f64a3702850..71062648c97 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;
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 61309a30d50..213ee1ae83c 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;