diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-14 17:57:43 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-16 18:53:46 +0200 |
| commit | f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1 (patch) | |
| tree | 4b510fcd7da78d67fa995c6daa33c3d7cd13842e /core | |
| parent | 2faae817f183e82975251d5023417e2f331971d3 (diff) | |
| download | nextcloud-server-f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1.tar.gz nextcloud-server-f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1.zip | |
Combine and minimize core and default app css files
Diffstat (limited to 'core')
| -rw-r--r-- | core/minimizer.php | 5 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 3 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/core/minimizer.php b/core/minimizer.php new file mode 100644 index 00000000000..e4e6ff50e66 --- /dev/null +++ b/core/minimizer.php @@ -0,0 +1,5 @@ +<?php + +$minimizer = new OC_Minimizer_CSS(); +$files = $minimizer->findFiles(OC_Util::$core_styles); +$minimizer->output($files); diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 86f46d9c7eb..37a74f46968 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,6 +4,9 @@ <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b832ac2636f..e6fa910ce04 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -4,6 +4,9 @@ <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> |