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

[stable15] Polishing fixes #12740

Merged
merged 3 commits into from
Nov 29, 2018
Merged

[stable15] Polishing fixes #12740

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
3119b2b
Fix app navigation edit entry
skjnldsv Nov 29, 2018
626ef06
Fix default filepicker style and gridview
skjnldsv Nov 29, 2018
8698678
Remove animation on the sidebar for accessibility purpose
skjnldsv Nov 29, 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
2 changes: 1 addition & 1 deletion apps/files/lib/Controller/ApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public function showGridView($show) {
* @NoAdminRequired
*/
public function getGridView() {
$status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '1') === '1';
$status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1';
return new JSONResponse(['gridview' => $status]);
}

Expand Down
30 changes: 8 additions & 22 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,12 @@ kbd {
top: 22px;
}

/* hide and animate deletion/collapse of subitems */
/* hide deletion/collapse of subitems */
&.deleted,
&.collapsible:not(.open) {
> ul {
opacity: 0;
max-height: 0;
overflow-y: hidden;
/* bezier override the hide/slow effect due to the 2000 max-height */
transition: max-height 1000ms cubic-bezier(0, 1, 0, 1),
opacity 250ms ease-in-out;
// NO ANIMATE because if not really hidden, we can still tab through it
display: none;
}
}

Expand All @@ -205,10 +201,6 @@ kbd {
> ul {
flex: 0 1 auto;
width: 100%;
transition: max-height 2000ms ease-in-out,
opacity 250ms ease-in-out;
max-height: 9999px;
opacity: 1;
position: relative;
> li {
display: inline-flex;
Expand Down Expand Up @@ -387,23 +379,15 @@ kbd {
-webkit-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
transform: rotate(-90deg);
z-index: 50;
z-index: 105; // above a, under button
background-color: var(--color-main-background);
transition: opacity $animation-quick ease-in-out;
}

/* force padding on link no matter if 'a' has an icon class */
> a:first-child {
padding-left: 44px;
}
&:before,
> a {
transition: background-position 100ms ease-in-out,
transform 250ms ease-in-out,
opacity 100ms ease-in-out;
}
&:hover > a,
&:focus > a {
background-position-x: -50px;
}
&:hover,
&:focus {
&:before {
Expand Down Expand Up @@ -519,6 +503,8 @@ kbd {
margin-left: -1px;
}
&:last-child {
border-bottom-right-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
Expand Down
5 changes: 2 additions & 3 deletions core/css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,12 +767,10 @@ code {
background-color: var(--color-main-background);
width: 100%;
}
#filestable.filelist {
#picker-filestable.filelist {
/* prevent the filepicker to overflow */
min-width: initial;
margin-bottom: 50px;
}
.filelist {
thead {
tr {
border-bottom: 1px solid var(--color-border);
Expand Down Expand Up @@ -872,6 +870,7 @@ code {
background-position: center top;
background-size: contain;
line-height: $name-height;
max-width: none;
}
&.filesize {
line-height: $name-height / 3;
Expand Down
4 changes: 2 additions & 2 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ var OCdialogs = {
// No grid for IE!
if (OC.Util.isIE()) {
self.$filePicker.find('#picker-view-toggle').remove();
self.$filePicker.find('#filestable').removeClass('view-grid');
self.$filePicker.find('#picker-filestable').removeClass('view-grid');
}

$('body').append(self.$filePicker);
Expand Down Expand Up @@ -808,7 +808,7 @@ var OCdialogs = {
_getGridSettings: function() {
var self = this;
$.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function(response) {
self.$showGridView.checked = response.gridview;
self.$showGridView.get(0).checked = response.gridview;
self.$showGridView.next('#picker-view-toggle')
.removeClass('icon-toggle-filelist icon-toggle-pictures')
.addClass(response.gridview ? 'icon-toggle-filelist' : 'icon-toggle-pictures')
Expand Down
2 changes: 1 addition & 1 deletion core/templates/filepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="icon-folder"></div>
<h2>{emptytext}</h2>
</div>
<table id="filestable" class="filelist list-container view-grid">
<table id="picker-filestable" class="filelist list-container view-grid">
<thead>
<tr>
<th id="headerName" class="column-name">
Expand Down