wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10378 from nextcloud/bugfix/noid/fix-icon-name-14

Browse source 
Fix icon file names
This commit is contained in:
Morris Jobke 2018-07-25 00:05:13 +02:00 committed by GitHub
commit f5e4fcadd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
View file

@ -93,7 +93,7 @@ class Calendar extends Base {
if ($this->activityManager->getRequirePNG()) { if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
} else { } else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
} }
if ($event->getSubject() === self::SUBJECT_ADD) { if ($event->getSubject() === self::SUBJECT_ADD) {

2
apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file

@ -87,7 +87,7 @@ class Event extends Base {
if ($this->activityManager->getRequirePNG()) { if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
} else { } else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
} }
if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') { if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {

2
apps/files_external/js/settings.js
View file

@ -186,7 +186,7 @@ function addSelect2 ($elements, userListLimit) {
.attr('data-name', element.name) .attr('data-name', element.name)
.attr('data-displayname', element.displayname); .attr('data-displayname', element.displayname);
if (element.type === 'group') { if (element.type === 'group') {
var url = OC.imagePath('core','places/contacts-dark'); // TODO better group icon var url = OC.imagePath('core','actions/group');
$div.html('<img width="32" height="32" src="'+url+'">'); $div.html('<img width="32" height="32" src="'+url+'">');
} }
return $result.get(0).outerHTML; return $result.get(0).outerHTML;

1
core/css/icons.scss
View file

@ -302,6 +302,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
@include icon-black-white('triangle-s', 'actions', 1, true); @include icon-black-white('triangle-s', 'actions', 1, true);
@include icon-black-white('upload', 'actions', 1, true); @include icon-black-white('upload', 'actions', 1, true);
@include icon-black-white('user', 'actions', 1, true); @include icon-black-white('user', 'actions', 1, true);
@include icon-black-white('group', 'actions', 1, true);
@include icon-black-white('video', 'actions', 2, true); @include icon-black-white('video', 'actions', 2, true);
.icon-video-white { .icon-video-white {

1
core/img/actions/group.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1"><path d="m10 1c-1.75 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.2 0.29 0.5 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.28 0.1-0.525 0.22-0.8 0.33-0.085-0.15-0.23-0.2-0.47-0.4-0.73-0.44-1.56-0.75-2.33-1.04-0.1-0.37-0.1-0.65 0-1 0.156-0.166 0.37-0.27 0.5-0.43 0.46-0.6 0.5-1.654 0.5-2.37 0-1.06-0.954-1.9-2-1.9-1.17 0-2 1-2 1.9 0 0.93 0.034 1.64 0.5 2.37 0.13 0.2 0.367 0.26 0.5 0.43 0.1 0.33 0.1 0.654 0 1-0.85 0.3-1.6 0.64-2.34 1.04-0.57 0.4-0.52 0.205-0.66 1.53-0.11 1.06 2.335 1.13 4 1.13 0.06 0 0.11 0 0.17 0-0.054 0.274-0.1 0.63-0.17 1.3-0.16 1.59 3.5 1.7 6 1.7s6.16-0.1 6-1.7c-0.215-2-0.23-1.71-1-2.3-1.1-0.654-2.45-1.17-3.6-1.6-0.15-0.56-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.7-0.6 0.7-0.885 0.8-2.425 0.8-3.5 0-1.6-1.43-2.8-3-2.8z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 838 B

1
core/img/actions/starred.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path fill="#FC0" d="m8 0.5 2.2 5.3 5.8 0.45-4.5 3.75 1.5 5.5-5-3.1-5 3.1 1.5-5.5-4.5-3.75 5.8-0.45z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 207 B

2
settings/js/federationscopemenu.js
View file

@ -55,7 +55,7 @@
name: 'contacts', name: 'contacts',
displayName: t('settings', 'Contacts'), displayName: t('settings', 'Contacts'),
tooltip: t('settings', 'Visible to local users and to trusted servers'), tooltip: t('settings', 'Visible to local users and to trusted servers'),
icon: OC.imagePath('core', 'places/contacts-dark'), icon: OC.imagePath('core', 'places/contacts'),
active: false active: false
}, },
{ {