Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 css/files/circles.filelist.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

.nav-icon-circlesfilter {
background-image: url('../../img/black_circle.svg');
background-image: url('../../img/circles_black.svg');
}

#app-sidebar .mainFileInfoView .tag-label {
Expand Down
1 change: 0 additions & 1 deletion img/add-user.svg

This file was deleted.

Binary file removed img/black_circle.png
Binary file not shown.
1 change: 0 additions & 1 deletion img/black_circle.svg

This file was deleted.

Binary file removed img/circles.png
Binary file not shown.
2 changes: 1 addition & 1 deletion img/circles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/closed.png
Binary file not shown.
1 change: 0 additions & 1 deletion img/closed.svg

This file was deleted.

Binary file removed img/colored.png
Binary file not shown.
1 change: 0 additions & 1 deletion img/colored.svg

This file was deleted.

54 changes: 0 additions & 54 deletions img/join.svg

This file was deleted.

22 changes: 0 additions & 22 deletions img/link-group.svg

This file was deleted.

Binary file removed img/personal.png
Binary file not shown.
1 change: 0 additions & 1 deletion img/personal.svg

This file was deleted.

Binary file removed img/secret.png
Binary file not shown.
1 change: 0 additions & 1 deletion img/secret.svg

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Activity/Filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function getPriority() {
*/
public function getIcon() {
return $this->url->getAbsoluteURL(
$this->url->imagePath(Application::APP_ID, 'black_circle.svg')
$this->url->imagePath(Application::APP_ID, 'circles.svg')
);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Model/ShareWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ private function setShareDisplay(IShare $share, IURLGenerator $urlGenerator) {
$share->setSharedWithDisplayName($display);

$icon = $urlGenerator->getAbsoluteURL(
$urlGenerator->imagePath(Application::APP_ID, 'black_circle.svg')
$urlGenerator->imagePath(Application::APP_ID, 'circles.svg')
);
$share->setSharedWithAvatar($icon);

Expand Down
2 changes: 1 addition & 1 deletion lib/Notification/Notifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function prepare(INotification $notification, string $languageCode): INot
throw new InvalidArgumentException();
}

$iconPath = $this->urlGenerator->imagePath(Application::APP_ID, 'black_circle.svg');
$iconPath = $this->urlGenerator->imagePath(Application::APP_ID, 'circles.svg');
$notification->setIcon($this->urlGenerator->getAbsoluteURL($iconPath));

if ($notification->getObjectType() === 'member') {
Expand Down
4 changes: 2 additions & 2 deletions lib/Service/CirclesService.php
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,12 @@ public static function getCircleIcon($type, $png = false) {
);
case DeprecatedCircle::CIRCLES_PUBLIC:
return $urlGen->getAbsoluteURL(
$urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext)
$urlGen->imagePath(Application::APP_ID, 'circles' . $ext)
);
}

return $urlGen->getAbsoluteURL(
$urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext)
$urlGen->imagePath(Application::APP_ID, 'circles' . $ext)
);
}

Expand Down