aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/dav/lib/Search/ContactsSearchProvider.php4
-rw-r--r--apps/dav/lib/Search/EventsSearchProvider.php4
-rw-r--r--apps/dav/lib/Search/TasksSearchProvider.php4
-rw-r--r--apps/dav/tests/unit/Search/ContactsSearchProviderTest.php2
-rw-r--r--apps/dav/tests/unit/Search/EventsSearchProviderTest.php2
-rw-r--r--apps/dav/tests/unit/Search/TasksSearchProviderTest.php2
-rw-r--r--apps/files/css/files.scss27
-rw-r--r--apps/settings/lib/Search/SectionSearch.php5
-rw-r--r--core/css/apps.scss50
-rw-r--r--core/css/header.scss8
-rw-r--r--lib/private/Preview/Generator.php6
-rw-r--r--tests/lib/Preview/GeneratorTest.php5
12 files changed, 65 insertions, 54 deletions
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
index f97ba2cf634..78747ebd70e 100644
--- a/apps/dav/lib/Search/ContactsSearchProvider.php
+++ b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -83,7 +83,7 @@ class ContactsSearchProvider implements IProvider {
* @inheritDoc
*/
public function getId(): string {
- return 'contacts-dav';
+ return 'contacts';
}
/**
@@ -100,7 +100,7 @@ class ContactsSearchProvider implements IProvider {
if ($route === 'contacts.Page.index') {
return -1;
}
- return 20;
+ return 25;
}
/**
diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php
index 619775aa193..c27996f96e7 100644
--- a/apps/dav/lib/Search/EventsSearchProvider.php
+++ b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -69,7 +69,7 @@ class EventsSearchProvider extends ACalendarSearchProvider {
* @inheritDoc
*/
public function getId(): string {
- return 'calendar-dav';
+ return 'calendar';
}
/**
@@ -86,7 +86,7 @@ class EventsSearchProvider extends ACalendarSearchProvider {
if ($route === 'calendar.View.index') {
return -1;
}
- return 10;
+ return 30;
}
/**
diff --git a/apps/dav/lib/Search/TasksSearchProvider.php b/apps/dav/lib/Search/TasksSearchProvider.php
index adc1197aa18..5af694bb85d 100644
--- a/apps/dav/lib/Search/TasksSearchProvider.php
+++ b/apps/dav/lib/Search/TasksSearchProvider.php
@@ -61,7 +61,7 @@ class TasksSearchProvider extends ACalendarSearchProvider {
* @inheritDoc
*/
public function getId(): string {
- return 'tasks-dav';
+ return 'tasks';
}
/**
@@ -78,7 +78,7 @@ class TasksSearchProvider extends ACalendarSearchProvider {
if ($route === 'tasks.Page.index') {
return -1;
}
- return 10;
+ return 35;
}
/**
diff --git a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
index 858e79d4423..1ca0457adb6 100644
--- a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
@@ -88,7 +88,7 @@ class ContactsSearchProviderTest extends TestCase {
}
public function testGetId(): void {
- $this->assertEquals('contacts-dav', $this->provider->getId());
+ $this->assertEquals('contacts', $this->provider->getId());
}
public function testGetName(): void {
diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
index eedbe39f12a..cd905760fac 100644
--- a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
@@ -250,7 +250,7 @@ class EventsSearchProviderTest extends TestCase {
}
public function testGetId(): void {
- $this->assertEquals('calendar-dav', $this->provider->getId());
+ $this->assertEquals('calendar', $this->provider->getId());
}
public function testGetName(): void {
diff --git a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
index 7220ff4ef48..732625980e8 100644
--- a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
@@ -134,7 +134,7 @@ class TasksSearchProviderTest extends TestCase {
}
public function testGetId(): void {
- $this->assertEquals('tasks-dav', $this->provider->getId());
+ $this->assertEquals('tasks', $this->provider->getId());
}
public function testGetName(): void {
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index e875e0da29a..e47e47d7f4b 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -21,9 +21,11 @@
.actions input, .actions button, .actions .button { margin:0; float:left; }
.actions .button a { color: #555; }
.actions .button a:hover,
-.actions .button a:focus,
+.actions .button a:focus {
+ background-color: var(--color-background-hover);
+}
.actions .button a:active {
- color: #333;
+ background-color: var(--color-primary-light);
}
.actions.creatable {
@@ -107,14 +109,12 @@
}
.app-files #app-content {
- transition: background-color 0.3s ease;
// force the width to be the full width to not go bigger than the screen
// flex will grow for the mobile view if necessary
width: calc(100% - 300px);
}
.file-drag, .file-drag #filestable tbody tr, .file-drag #filestable tbody tr:hover {
- transition: background-color 0.3s ease!important;
background-color: var(--color-primary-light) !important;
}
@@ -186,22 +186,23 @@
}
#filestable tbody tr {
- transition: background-color 0.3s ease;
height: 51px;
}
#filestable tbody tr:hover,
#filestable tbody tr:focus,
#filestable tbody .name:focus,
+#filestable tbody tr:hover .filename form,
+table tr.mouseOver td {
+ background-color: var(--color-background-hover);
+}
#filestable tbody tr:active,
#filestable tbody tr.highlighted,
#filestable tbody tr.highlighted .name:focus,
#filestable tbody tr.selected,
-#filestable tbody tr.searchresult,
-#filestable tbody tr:hover .filename form,
-table tr.mouseOver td {
- transition: background-color 0.3s ease;
- background-color: var(--color-background-dark);
+#filestable tbody tr.searchresult {
+ background-color: var(--color-primary-light);
}
+
tbody a { color: var(--color-main-text); }
span.conflict-path, span.extension, span.uploading, td.date {
@@ -625,6 +626,9 @@ a.action > img {
.fileActionsMenu a.action, a.action.action-share.shared-style {
opacity: .7;
}
+ .fileActionsMenu .action.permanent {
+ opacity: 1;
+ }
}
// Ellipsize long sharer names
@@ -878,8 +882,7 @@ table.dragshadow td.size {
.thumbnail-wrapper,
.nametext,
.fileactions {
- transition: background-color 0.3s ease;
- background-color: var(--color-background-dark);
+ background-color: var(--color-background-hover);
}
}
}
diff --git a/apps/settings/lib/Search/SectionSearch.php b/apps/settings/lib/Search/SectionSearch.php
index 795b9f7e9f7..b90eda42bb6 100644
--- a/apps/settings/lib/Search/SectionSearch.php
+++ b/apps/settings/lib/Search/SectionSearch.php
@@ -62,7 +62,7 @@ class SectionSearch implements IProvider {
* @inheritDoc
*/
public function getId(): string {
- return 'settings_sections';
+ return 'settings';
}
/**
@@ -79,7 +79,8 @@ class SectionSearch implements IProvider {
if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
return -1;
}
- return 20;
+ // At the very bottom
+ return 500;
}
/**
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 420e5bb4a04..cb2b32611b1 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -152,16 +152,20 @@ kbd {
padding-left: 38px !important;
}
- &.active,
a:hover,
- a:focus,
+ a:focus {
+ &,
+ > a {
+ background-color: var(--color-background-hover);
+ }
+ }
+ &.active,
a:active,
a.selected ,
a.active {
&,
> a {
- opacity: 1;
- box-shadow: inset 4px 0 var(--color-primary-element);
+ background-color: var(--color-primary-light);
}
}
@@ -186,8 +190,6 @@ kbd {
padding: 0 44px;
white-space: nowrap;
text-overflow: ellipsis;
- // !important to overwrite specific hover and focus
- opacity: .7;
box-shadow: none !important;
user-select: none;
pointer-events:none;
@@ -207,19 +209,20 @@ kbd {
flex-wrap: wrap;
padding-left: 44px;
&:hover,
- &:focus,
+ &:focus {
+ &,
+ > a {
+ background-color: var(--color-background-hover);
+ }
+ }
&.active,
a.selected {
&,
> a {
- opacity: 1;
+ background-color: var(--color-primary-light);
}
}
- &.active {
- box-shadow: inset 4px 0 var(--color-primary-element);
- }
-
/* align loader */
&.icon-loading-small:after {
left: 22px; /* 44px / 2 */
@@ -270,7 +273,7 @@ kbd {
white-space: nowrap;
text-overflow: ellipsis;
color: var(--color-main-text);
- opacity: .57;
+ opacity: .8;
flex: 1 1 0px;
z-index: 100; /* above the bullet to allow click*/
/* TODO: forbid using img as icon in menu? */
@@ -384,7 +387,8 @@ kbd {
-ms-transform: rotate(-90deg);
transform: rotate(-90deg);
z-index: 105; // above a, under button
- background-color: var(--color-main-background);
+ background-color: var(--color-background-hover);
+ border-radius: 50%;
transition: opacity $animation-quick ease-in-out;
}
@@ -730,17 +734,14 @@ $min-content-width: $breakpoint-mobile - $navigation-width - $list-min-width;
/* like app-navigation a */
color: var(--color-main-text);
- opacity: .57;
&.opened {
border-top: solid 1px var(--color-border);
+ background-color: var(--color-main-background);
}
&:hover,
- &:focus,
- &.opened {
- background-color: var(--color-main-background);
- opacity: 1;
- box-shadow: inset 4px 0 var(--color-primary-element);
+ &:focus {
+ background-color: var(--color-background-hover);
}
}
@@ -953,8 +954,7 @@ $outter-margin: ($popoveritem-height - $popovericon-size) / 2;
width: 100%;
color: var(--color-main-text);
white-space: nowrap;
- /* Override the app-navigation li opacity */
- opacity: .7 !important;
+
span[class^='icon-'],
span[class*=' icon-'],
&[class^='icon-'],
@@ -985,9 +985,11 @@ $outter-margin: ($popoveritem-height - $popovericon-size) / 2;
padding: 0 #{($popoveritem-height - $popovericon-size) / 2} 0 $popoveritem-height !important;
}
&:hover,
- &:focus,
+ &:focus {
+ background-color: var(--color-background-hover);
+ }
&.active {
- opacity: 1 !important;
+ background-color: var(--color-primary-light);
}
/* prevent .action class to break the design */
&.action {
diff --git a/core/css/header.scss b/core/css/header.scss
index 1851695f1ea..e4a22141b06 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -135,16 +135,16 @@
color: var(--color-main-text);
padding: 10px 12px;
box-sizing: border-box;
- opacity: .7;
white-space: nowrap;
position: relative;
width: 100%;
&:hover,
- &:focus,
+ &:focus {
+ background-color: var(--color-background-hover);
+ }
&:active,
&.active {
- opacity: 1;
- box-shadow: inset 4px 0 var(--color-primary-element);
+ background-color: var(--color-primary-light);
}
span {
display: inline-block;
diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index f7aed987d89..e47a7e5927c 100644
--- a/lib/private/Preview/Generator.php
+++ b/lib/private/Preview/Generator.php
@@ -192,6 +192,12 @@ class Generator {
}
}
+ // Free memory being used by the embedded image resource. Without this the image is kept in memory indefinitely.
+ // Garbage Collection does NOT free this memory. We have to do it ourselves.
+ if ($maxPreviewImage instanceof \OC_Image) {
+ $maxPreviewImage->destroy();
+ }
+
return $preview;
}
diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php
index 3a46447632d..5e9b9bcbb8d 100644
--- a/tests/lib/Preview/GeneratorTest.php
+++ b/tests/lib/Preview/GeneratorTest.php
@@ -31,7 +31,6 @@ use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IConfig;
-use OCP\IImage;
use OCP\IPreview;
use OCP\Preview\IProviderV2;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -183,7 +182,7 @@ class GeneratorTest extends \Test\TestCase {
$this->fail('Unexpected provider requested');
});
- $image = $this->createMock(IImage::class);
+ $image = $this->createMock(\OC_Image::class);
$image->method('width')->willReturn(2048);
$image->method('height')->willReturn(2048);
$image->method('valid')->willReturn(true);
@@ -318,7 +317,7 @@ class GeneratorTest extends \Test\TestCase {
}
private function getMockImage($width, $height, $data = null) {
- $image = $this->createMock(IImage::class);
+ $image = $this->createMock(\OC_Image::class);
$image->method('height')->willReturn($width);
$image->method('width')->willReturn($height);
$image->method('valid')->willReturn(true);
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-04 10:03:12 +0000