diff options
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/default.css | 6 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 1 | ||||
| -rw-r--r-- | apps/theming/tests/ImageManagerTest.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/Themes/DefaultThemeTest.php | 19 |
4 files changed, 3 insertions, 25 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index bf7ad0f89cc..fb541b7aca9 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -59,10 +59,4 @@ --primary-invert-if-bright: no; --background-invert-if-dark: no; --background-invert-if-bright: invert(100%); - --image-logo: url('/core/img/logo/logo.png?v=0'); - --image-logoheader: url('/core/img/logo/logo.png?v=0'); - --image-favicon: url('/core/img/logo/logo.png?v=0'); - --image-background-size: cover; - --image-background: url('/core/img/background.png?v=0'); - --image-login-background: url('/core/img/background.png?v=0'); } diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 6158d79a224..2908d365a4a 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -191,6 +191,7 @@ class DefaultTheme implements ITheme { '--background-invert-if-bright' => 'invert(100%)', ]; + // Register image variables only if custom-defined $backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor'; foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) { if ($this->imageManager->hasImage($image)) { diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index 0f22a774a39..6a9b77234bb 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -307,7 +307,7 @@ class ImageManagerTest extends TestCase { foreach ($folders as $index => $folder) { $folder->expects($this->any()) ->method('getName') - ->willReturn((string)$index); + ->willReturn($index); } $folders[0]->expects($this->once())->method('delete'); $folders[1]->expects($this->once())->method('delete'); diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php index 5086c5da8ee..160efdba142 100644 --- a/apps/theming/tests/Themes/DefaultThemeTest.php +++ b/apps/theming/tests/Themes/DefaultThemeTest.php @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -namespace OCA\Theming\Tests; +namespace OCA\Theming\Tests\Service; use OC\App\AppManager; use OCA\Theming\ImageManager; @@ -68,23 +68,6 @@ class DefaultThemeTest extends TestCase { ->method('getColorPrimary') ->willReturn('#0082c9'); - $this->imageManager->expects($this->any()) - ->method('getImageUrl') - ->willReturnCallback(function (string $name): string { - switch ($name) { - case 'logo': - case 'logoheader': - case 'favicon': - return '/core/img/logo/logo.png?v=0'; - case 'background': - case 'login-background': - return '/core/img/background.png?v=0'; - default: - return ''; - } - }); - - $this->l10n ->expects($this->any()) ->method('t') |