From cc8b1d382910e13c0825e5a3fdb33276f65cf2bd Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Mon, 17 Oct 2016 14:51:31 +0200 Subject: [PATCH] Fix icon-folder css Signed-off-by: Julius Haertl --- apps/theming/lib/Controller/ThemingController.php | 2 +- .../theming/tests/Controller/ThemingControllerTest.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index c908f0e5782..c0661409d05 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -406,7 +406,7 @@ class ThemingController extends Controller { if($logo !== '' or $color !== '') { $responseCss .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v='.$cacheBusterValue.'\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v='.$cacheBusterValue.'\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v='.$cacheBusterValue.'\')!important;' . "}\n"; diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index b7bce2d6ec0..3bf7709b0de 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -477,7 +477,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expectedData .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v=0\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v=0\')!important;' . "}\n"; @@ -577,7 +577,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '.ui-widget-header { color: #000000; }' . "\n"; $expectedData .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v=0\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v=0\')!important;' . "}\n"; @@ -628,7 +628,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expectedData .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v=0\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v=0\')!important;' . "}\n"; @@ -776,7 +776,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expectedData .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v=0\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v=0\')!important;' . "}\n"; @@ -893,7 +893,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '.ui-widget-header { color: #000000; }' . "\n"; $expectedData .= '.icon-file,.icon-filetype-text {' . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . - '.icon-folder, .icon-filetype-folder ' . + '.icon-folder, .icon-filetype-folder {' . 'background-image: url(\'./img/core/filetypes/folder.svg?v=0\');' . "}\n" . '.icon-filetype-folder-drag-accept {' . 'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v=0\')!important;' . "}\n"; -- 2.39.5