diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-09 11:43:06 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-07-19 08:16:59 +0200 |
| commit | 61946819baa1cb94b5f89330b739653b8231c7ed (patch) | |
| tree | e346d8d43696abb8e618e19cb1bd660598ced45f | |
| parent | dccfed8d1c1714eb31f443482bd7ef98c54d638c (diff) | |
| download | nextcloud-server-61946819baa1cb94b5f89330b739653b8231c7ed.tar.gz nextcloud-server-61946819baa1cb94b5f89330b739653b8231c7ed.zip | |
Fixed svg generator regex && added missing icons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/files/css/files.scss | 4 | ||||
| -rw-r--r-- | core/Controller/SvgController.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 4e48cc5714b..85c59294803 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -90,7 +90,7 @@ @include icon-color('recent', 'files', $color-black); } .nav-icon-favorites { - @include icon-color('star-dark', 'files', $color-black); + @include icon-color('star-dark', 'files', $color-black, 2, true); } .nav-icon-sharingin, .nav-icon-sharingout { @@ -106,7 +106,7 @@ @include icon-color('delete', 'files', $color-black); } .nav-icon-deletedshares { - background-image: url('../img/unshare.svg?v=1'); + @include icon-color('unshare', 'files', $color-black); } #app-navigation .nav-files a.nav-icon-files { diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php index b1a78752c41..3dedccc6377 100644 --- a/core/Controller/SvgController.php +++ b/core/Controller/SvgController.php @@ -111,7 +111,7 @@ class SvgController extends Controller { } // add fill (fill is not present on black elements) - $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#])+)\/>/mi'; + $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;])+)\/>/mi'; $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg); |