Skip to content

Commit

Permalink
Merge pull request #12180 from nextcloud/sidebar-fixes
Browse files Browse the repository at this point in the history
Sidebar fixes, mostly fixing design of tabs
  • Loading branch information
MorrisJobke authored Nov 1, 2018
2 parents 0a61242 + c0aee3f commit bfab6cc
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 7 deletions.
10 changes: 8 additions & 2 deletions apps/files/css/detailsView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions apps/files_versions/js/versionstabview.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
return t('files_versions', 'Versions');
},

getIcon: function() {
return 'icon-history';
},

nextPage: function() {
if (this._loading) {
return;
Expand Down
30 changes: 25 additions & 5 deletions core/css/apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bfab6cc

Please sign in to comment.