Merge pull request #800 from gergo85/master

Optimized images and update jQuery
This commit is contained in:
Samuel Georges 2014-12-06 09:28:01 +11:00
commit 7a289e63a2
18 changed files with 7 additions and 9797 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@
<link href="<?= Backend::skinAsset('assets/vendor/select2/select2.css') ?>" rel="stylesheet">
<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>" rel="stylesheet">
<script src="<?= Backend::skinAsset('assets/js/vendor/jquery-2.0.3.min.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/vendor/modernizr.min.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/vendor/mousewheel.js') ?>"></script>

View File

@ -6,7 +6,7 @@
<title><?= e(trans('backend::lang.auth.title')) ?></title>
<link href="<?= URL::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery-2.0.3.min.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::to('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/october.utils.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/vendor/modernizr.min.js') ?>"></script>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -103,7 +103,7 @@ class CombineAssets
/*
* Common Aliases
*/
$this->registerAlias('js', 'jquery', '~/modules/backend/assets/js/vendor/jquery-2.0.3.min.js');
$this->registerAlias('js', 'jquery', '~/modules/backend/assets/js/vendor/jquery.min.js');
$this->registerAlias('js', 'framework', '~/modules/system/assets/js/framework.js');
$this->registerAlias('js', 'framework.extras', '~/modules/system/assets/js/framework.extras.js');
$this->registerAlias('css', 'framework.extras', '~/modules/system/assets/css/framework.extras.css');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 40 KiB

File diff suppressed because one or more lines are too long