mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[theming] reload css variables instead of the whole server css 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-06-14 15:55:07 +02:00 committed by John Molakvoæ (skjnldsv)
parent b69d345677
commit 80efb51a1a
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/theming/css/settings-admin.scss
View File

@ -122,3 +122,11 @@
background-size: contain; background-size: contain;
} }
} }
/* transition effects for theming value changes */
#header {
transition: background-color 500ms linear;
svg, img {
transition: 500ms filter linear;
}
}

12
apps/theming/lib/Controller/ThemingController.php
View File

@ -201,14 +201,14 @@ class ThemingController extends Controller {
$this->themingDefaults->set($setting, $value); $this->themingDefaults->set($setting, $value);
// reprocess server scss for preview // reprocess server scss for preview
$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/server.scss', 'core'); $cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/css-variables.scss', 'core');
return new DataResponse( return new DataResponse(
[ [
'data' => 'data' =>
[ [
'message' => $this->l10n->t('Saved'), 'message' => $this->l10n->t('Saved'),
'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/server.scss')) 'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/css-variables.scss'))
], ],
'status' => 'success' 'status' => 'success'
] ]
@ -302,7 +302,7 @@ class ThemingController extends Controller {
$this->themingDefaults->set($key.'Mime', $image['type']); $this->themingDefaults->set($key.'Mime', $image['type']);
$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/server.scss', 'core'); $cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/css-variables.scss', 'core');
return new DataResponse( return new DataResponse(
[ [
@ -311,7 +311,7 @@ class ThemingController extends Controller {
'name' => $name, 'name' => $name,
'url' => $this->imageManager->getImageUrl($key), 'url' => $this->imageManager->getImageUrl($key),
'message' => $this->l10n->t('Saved'), 'message' => $this->l10n->t('Saved'),
'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/server.scss')) 'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/css-variables.scss'))
], ],
'status' => 'success' 'status' => 'success'
] ]
@ -328,7 +328,7 @@ class ThemingController extends Controller {
public function undo(string $setting): DataResponse { public function undo(string $setting): DataResponse {
$value = $this->themingDefaults->undo($setting); $value = $this->themingDefaults->undo($setting);
// reprocess server scss for preview // reprocess server scss for preview
$cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/server.scss', 'core'); $cssCached = $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/css-variables.scss', 'core');
if (strpos($setting, 'Mime') !== -1) { if (strpos($setting, 'Mime') !== -1) {
$imageKey = str_replace('Mime', '', $setting); $imageKey = str_replace('Mime', '', $setting);
@ -341,7 +341,7 @@ class ThemingController extends Controller {
[ [
'value' => $value, 'value' => $value,
'message' => $this->l10n->t('Saved'), 'message' => $this->l10n->t('Saved'),
'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/server.scss')) 'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/css-variables.scss'))
], ],
'status' => 'success' 'status' => 'success'
] ]