archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #34327 from nextcloud/fix/favourite

Browse Source 
Fix starred favourite icon
pull/32012/head
Simon L 2 years ago committed by GitHub
parent d647025f61 eb6ed7dcfd
commit b4708fb9f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File

3
apps/files/css/files.css
Unescape Escape View File

@ -973,8 +973,7 @@ table.dragshadow td.size {
background-image: none;
}
.files-filestable .filename .favorite-mark .icon-starred {
/* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */
background-image: var(--icon-star-dark-yellow);
background-image: var(--icon-starred-yellow) !important;
}
.files-filestable .filename .action .icon.hidden,

2
apps/files/css/files.css.map
View File

File diff suppressed because one or more lines are too long

2
apps/files/css/files.scss
Unescape Escape View File

@ -874,7 +874,7 @@ table.dragshadow td.size {
background-image: none;
}
& .icon-starred {
@include icon-color('star-dark', 'actions', variables.$color-yellow, 1, true);
background-image: var(--icon-starred-yellow) !important;
}
}

3
apps/files/css/merged.css
Unescape Escape View File

@ -973,8 +973,7 @@ table.dragshadow td.size {
background-image: none;
}
.files-filestable .filename .favorite-mark .icon-starred {
/* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */
background-image: var(--icon-star-dark-yellow);
background-image: var(--icon-starred-yellow) !important;
}
.files-filestable .filename .action .icon.hidden,

2
apps/files/css/merged.css.map
View File

File diff suppressed because one or more lines are too long

8
core/src/icons.js
Unescape Escape View File

@ -138,6 +138,10 @@ const iconsColor = {
path: path.join(__dirname, '../img', 'actions', 'star-dark.svg'),
color: 'yellow',
},
'star': {
path: path.join(__dirname, '../img', 'actions', 'star-dark.svg'),
color: 'grey',
},
'delete-color': {
path: path.join(__dirname, '../img', 'actions', 'delete.svg'),
color: 'red',
@ -170,8 +174,8 @@ const iconsAliases = {
'icon-star:hover': 'icon-starred',
'icon-star:focus': 'icon-starred',
// Un-starring action
'icon-starred:hover': 'icon-star',
'icon-starred:focus': 'icon-star',
'icon-starred:hover': 'icon-star-grey',
'icon-starred:focus': 'icon-star-grey',
// Delete normal
'icon-delete.no-permission:hover': 'icon-delete-dark',
'icon-delete.no-permission:focus': 'icon-delete-dark',

8
dist/icons.css vendored
Unescape Escape View File

@ -209,6 +209,7 @@
--icon-error-color-red: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik01LjUxNiAyTDIgNS41MTZ2NC45NjhMNS41MTYgMTRoNC45NjhMMTQgMTAuNDg0VjUuNTE2TDEwLjQ4NCAySDUuNTE2ek03IDRoMnY1SDdWNHptMCA2aDJ2Mkg3di0yeiIgZmlsbD0iI2U5MzIyZCIvPjwvc3ZnPgo=);
--icon-checkmark-color-green: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiPjxwYXRoIGQ9Im0yLjM1IDcuMyA0IDRsNy4zLTcuMyIgc3Ryb2tlPSIjNDZiYTYxIiBzdHJva2Utd2lkdGg9IjIiIGZpbGw9Im5vbmUiLz48L3N2Zz4K);
--icon-starred-yellow: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Im04IDAuNSAyLjIgNS4zIDUuOCAwLjQ1LTQuNSAzLjc1IDEuNSA1LjUtNS0zLjEtNSAzLjEgMS41LTUuNS00LjUtMy43NSA1LjgtMC40NXoiIGZpbGw9IiNGQzAiLz48L3N2Zz4K);
--icon-star-grey: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Im04IDAuNSAyLjIgNS4zIDUuOCAwLjQ1LTQuNSAzLjc1IDEuNSA1LjUtNS0zLjEtNSAzLjEgMS41LTUuNS00LjUtMy43NSA1LjgtMC40NXoiIGZpbGw9IiM5Njk2OTYiLz48L3N2Zz4K);
--icon-delete-color-red: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik02LjUgMUw2IDJIM2MtLjU1NCAwLTEgLjQ0Ni0xIDF2MWgxMlYzYzAtLjU1NC0uNDQ2LTEtMS0xaC0zbC0uNS0xek0zIDVsLjg3NSA5Yy4wNi41NS41NzMgMSAxLjEyNSAxaDZjLjU1MiAwIDEuMDY0LS40NSAxLjEyNS0xTDEzIDV6IiBmaWxsPSIjZTkzMjJkIi8+PC9zdmc+Cg==);
--icon-file-grey: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiIgd2lkdGg9IjE2IiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iMTYiPjxwYXRoIGZpbGw9IiM5Njk2OTYiIGQ9Im0yLjUgMWMtMC4yOCAwLTAuNSAwLjIyLTAuNSAwLjV2MTNjMCAwLjI4IDAuMjIgMC41IDAuNSAwLjVoMTFjMC4yOCAwIDAuNS0wLjIyIDAuNS0wLjV2LTEwLjVsLTMtM2gtOC41em0xLjUgMmg2djFoLTZ2LTF6bTAgM2g1djFoLTV2LTF6bTAgM2g4djFoLTh2LTF6bTAgM2g0djFoLTR2LTF6Ii8+PC9zdmc+Cg==);
--icon-filetype-file-grey: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgd2lkdGg9IjE2IiB2ZXJzaW9uPSIxLjEiPjxwYXRoIGZpbGw9IiM5Njk2OTYiIGQ9Im0yLjUgMWMtMC4yOCAwLTAuNSAwLjIyLTAuNSAwLjV2MTNjMCAwLjI4IDAuMjIgMC41IDAuNSAwLjVoMTFjMC4yOCAwIDAuNS0wLjIyIDAuNS0wLjV2LTEwLjVsLTMtM3oiLz48L3N2Zz4K);
@ -1260,6 +1261,9 @@ body .icon-checkmark-color {
body .icon-starred {
background-image: var(--icon-starred-yellow);
}
body .icon-star {
background-image: var(--icon-star-grey);
}
body .icon-delete-color {
background-image: var(--icon-delete-color-red);
}
@ -1285,10 +1289,10 @@ body .icon-star:focus {
background-image: var(--icon-starred);
}
body .icon-starred:hover {
background-image: var(--icon-star);
background-image: var(--icon-star-grey);
}
body .icon-starred:focus {
background-image: var(--icon-star);
background-image: var(--icon-star-grey);
}
body .icon-delete.no-permission:hover {
background-image: var(--icon-delete-dark);

Write Preview
Loading…
Cancel
Save