summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2017-10-30 19:01:22 +0100
committerGitHub <noreply@github.com>2017-10-30 19:01:22 +0100
commitfcb9c034fa6c872a908dc6efd11056b0fae69f2c (patch)
treee17621eeee943454ff710e8dc171a216912da7af
parentc8323f822d6553e64f956c096d7c5f96319324db (diff)
parent446a3d2f215f52529955ebe4edd036806f00bfb2 (diff)
downloadnextcloud-server-fcb9c034fa6c872a908dc6efd11056b0fae69f2c.tar.gz
nextcloud-server-fcb9c034fa6c872a908dc6efd11056b0fae69f2c.zip
Merge pull request #7012 from nextcloud/show-favourite-action-as-the-first-one
Show favourite action as the first one in the file actions menu
-rw-r--r--apps/files/js/tagsplugin.js6
-rw-r--r--core/css/icons.scss4
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 2286477750c..747a7245a56 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -103,17 +103,17 @@
return t('files', 'Add to favorites');
},
mime: 'all',
- order: -23,
+ order: -100,
permissions: OC.PERMISSION_READ,
iconClass: function(fileName, context) {
var $file = context.$file;
var isFavorite = $file.data('favorite') === true;
if (isFavorite) {
- return 'icon-starred';
+ return 'icon-star-dark';
}
- return 'icon-star';
+ return 'icon-starred';
},
actionHandler: function(fileName, context) {
var $favoriteMarkEl = context.$file.find('.favorite-mark');
diff --git a/core/css/icons.scss b/core/css/icons.scss
index 6d855381fae..c8f61c1422e 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -348,6 +348,10 @@ img, object, video, button, textarea, input, select {
background-image: url('../img/actions/star.svg?v=1');
}
+.icon-star-dark {
+ background-image: url('../img/actions/star-dark.svg?v=1');
+}
+
.icon-starred {
&:hover, &:focus {
background-image: url('../img/actions/star.svg?v=1');