Skip to content

Svg color api #9984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 19 commits into from
Jul 19, 2018
Merged

Svg color api #9984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
84e90e2
Svg color api
skjnldsv Jun 25, 2018
98a0113
Svg from app
skjnldsv Jun 26, 2018
29ff7ef
Svg icon api sass function and upgrade of all styles
skjnldsv Jun 29, 2018
ccd70a4
use built in response cacheFor function
skjnldsv Jun 29, 2018
09f591f
Dark theme fixes
skjnldsv Jun 29, 2018
d904293
autoloader bump
skjnldsv Jun 29, 2018
8977c71
Mixin scss icon api
skjnldsv Jul 3, 2018
9e58859
Fixed icons detection and caching
skjnldsv Jul 4, 2018
a24cad1
Fix accessibility invert
skjnldsv Jul 4, 2018
cd6f00a
Only dark
skjnldsv Jul 4, 2018
59db525
Autoloader bump
skjnldsv Jul 4, 2018
14bc9ff
Fixed tests
skjnldsv Jul 4, 2018
dccfed8
Add versionning to icon svg color api function
skjnldsv Jul 9, 2018
6194681
Fixed svg generator regex && added missing icons
skjnldsv Jul 9, 2018
6ed8c19
Use proper URL prefix for icons
juliusknorr Jul 10, 2018
9159ed3
Fix icon url regex
juliusknorr Jul 18, 2018
bfc6fc8
Fix settings icon fetching
juliusknorr Jul 18, 2018
37a4d2b
Php code bump
skjnldsv Jul 19, 2018
9d94cc1
Fix unit tests
rullzer Jul 19, 2018
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
Prev Previous commit
Next Next commit
Fixed svg generator regex && added missing icons 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv @juliusknorr
skjnldsv authored and juliusknorr committed Jul 19, 2018
commit 61946819baa1cb94b5f89330b739653b8231c7ed
4 changes: 2 additions & 2 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/Controller/SvgController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private function getSvg(string $path, string $color, string $fileName) {
}

// 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);

Expand Down