Merge pull request #12180 from nextcloud/sidebar-fixes

Sidebar fixes, mostly fixing design of tabs
This commit is contained in:
Morris Jobke 2018-11-01 12:42:03 +01:00 committed by GitHub
commit bfab6ccf1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 7 deletions

View File

@ -15,7 +15,13 @@
#app-sidebar .mainFileInfoView .permalink { #app-sidebar .mainFileInfoView .permalink {
padding: 6px 10px; padding: 6px 10px;
vertical-align: text-top; vertical-align: top;
opacity: .6;
&:hover,
&:focus {
opacity: 1;
}
} }
#app-sidebar .mainFileInfoView .permalink-field>input { #app-sidebar .mainFileInfoView .permalink-field>input {
clear: both; clear: both;
@ -87,7 +93,7 @@
} }
#app-sidebar .fileName h3 { #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; display: inline-block;
padding: 5px 0; padding: 5px 0;
margin: -5px 0; margin: -5px 0;

View File

@ -38,6 +38,10 @@
return t('files_versions', 'Versions'); return t('files_versions', 'Versions');
}, },
getIcon: function() {
return 'icon-history';
},
nextPage: function() { nextPage: function() {
if (this._loading) { if (this._loading) {
return; return;

View File

@ -781,27 +781,47 @@ kbd {
/* TABS ------------------------------------------------------------ */ /* TABS ------------------------------------------------------------ */
.tabHeaders { .tabHeaders {
display: inline-block; display: flex;
margin: 15px; margin-bottom: 16px;
.tabHeader { .tabHeader {
float: left; display: flex;
padding: 12px; flex-direction: column;
flex-grow: 1;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer; cursor: pointer;
color: var(--color-text-lighter); color: var(--color-text-lighter);
margin-bottom: 1px; margin-bottom: 1px;
padding: 5px;
/* Use same amount as sidebar padding */
&:first-child {
padding-left: 15px;
}
&:last-child {
padding-right: 15px;
}
.icon { .icon {
display: inline-block; display: inline-block;
width: 16px; width: 100%;
height: 16px; height: 16px;
background-size: 16px; background-size: 16px;
vertical-align: middle; vertical-align: middle;
margin-top: -2px; margin-top: -2px;
margin-right: 3px; margin-right: 3px;
opacity: .7; opacity: .7;
cursor: pointer;
} }
a { a {
color: var(--color-text-lighter); color: var(--color-text-lighter);
margin-bottom: 1px; margin-bottom: 1px;
overflow: hidden;
text-overflow: ellipsis;
} }
&.selected { &.selected {
font-weight: bold; font-weight: bold;