Merge pull request #189 from nextcloud/fix-menu-toggle

Rename icon to not interfere with icon-menu server class
This commit is contained in:
Raimund Schlüßler 2018-08-18 23:31:20 +02:00 committed by GitHub
commit 979137b781
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -1314,8 +1314,8 @@ ol[dnd-list] {
padding: 0;
background-size: auto;
&.icon-menu {
@extend .icon-menu;
&.icon-list {
@extend .icon-list;
}
&.icon-calendar {

View file

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 139 B

View file

@ -376,7 +376,7 @@
case 'manual':
return 'icon-manual';
default:
return 'icon-menu';
return 'icon-list';
}
};

View file

@ -199,7 +199,7 @@
<ul>
<li ng-click="setSortOrder($event, 'default')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'default'}" class="handler">
<a>
<span class="icon icon-menu"></span>
<span class="icon icon-list"></span>
<span class="label"><?php p($l->t('Default')); ?></span>
<span class="icon sort-indicator" ng-class="{'icon-sort-up': settingsmodel.getById('various').sortDirection, 'icon-sort-down': !settingsmodel.getById('various').sortDirection}"></span>
</a>