Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sidebar fixes, mostly fixing design of tabs #12180

Merged
merged 3 commits into from
Nov 1, 2018
Merged

Sidebar fixes, mostly fixing design of tabs #12180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb1d503
Add icon to Versions sidebar tab
jancborchardt Nov 1, 2018
4e12132
Fix issues with clipboard button for local link in sidebar
jancborchardt Nov 1, 2018
c0aee3f
Fix design of tabs in sidebar
jancborchardt Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions apps/files/css/detailsView.scss
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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