diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-06-14 15:55:07 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-20 19:20:51 +0200 |
| commit | 80efb51a1a7a0e00fc26302388d7b95b28c60208 (patch) | |
| tree | c1d7d47c703ab3518f8cc10a4af4781516c16172 /apps/theming | |
| parent | b69d345677c97dbdbb45273aa89d7efcfac81c31 (diff) | |
| download | nextcloud-server-80efb51a1a7a0e00fc26302388d7b95b28c60208.tar.gz nextcloud-server-80efb51a1a7a0e00fc26302388d7b95b28c60208.zip | |
[theming] reload css variables instead of the whole server css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/settings-admin.scss | 8 | ||||
| -rw-r--r-- | apps/theming/lib/Controller/ThemingController.php | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index 7753540ccd2..c67d48d46fe 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -122,3 +122,11 @@ background-size: contain; } } + +/* transition effects for theming value changes */ +#header { + transition: background-color 500ms linear; + svg, img { + transition: 500ms filter linear; + } +}
\ No newline at end of file diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 96f8dfde9fd..44f1ea51c06 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -201,14 +201,14 @@ class ThemingController extends Controller { $this->themingDefaults->set($setting, $value); // 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( [ 'data' => [ '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' ] @@ -302,7 +302,7 @@ class ThemingController extends Controller { $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( [ @@ -311,7 +311,7 @@ class ThemingController extends Controller { 'name' => $name, 'url' => $this->imageManager->getImageUrl($key), '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' ] @@ -328,7 +328,7 @@ class ThemingController extends Controller { public function undo(string $setting): DataResponse { $value = $this->themingDefaults->undo($setting); // 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) { $imageKey = str_replace('Mime', '', $setting); @@ -341,7 +341,7 @@ class ThemingController extends Controller { [ 'value' => $value, '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' ] |