move fonts & images to resources/dist

This commit is contained in:
printempw 2016-09-24 23:48:52 +08:00
parent 1e57e9cef4
commit e598b37db4
27 changed files with 19 additions and 20 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ storage/textures/*
node_modules/*
resources/src/bower_components/*
koala-config.json
resources/dist/css/*
resources/dist/js/*

View File

@ -2,7 +2,7 @@
* @Author: prpr
* @Date: 2016-07-21 13:38:26
* @Last Modified by: printempw
* @Last Modified time: 2016-09-15 11:09:48
* @Last Modified time: 2016-09-24 23:44:24
*/
var gulp = require('gulp'),
@ -41,12 +41,12 @@ var vendor_css = [
var replacements = [
['@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);', ''],
['../fonts/glyphicons', '../../fonts/glyphicons'],
['../fonts/fontawesome', '../../fonts/fontawesome'],
['blue.png', '"../../images/blue.png"'],
['blue@2x.png', '"../../images/blue@2x.png"'],
['../img/loading.gif', '"../../images/loading.gif"'],
['../img/loading-sm.gif', '"../../images/loading-sm.gif"']
['../fonts/glyphicons', '../fonts/glyphicons'],
['../fonts/fontawesome', '../fonts/fontawesome'],
['blue.png', '"../images/blue.png"'],
['blue@2x.png', '"../images/blue@2x.png"'],
['../img/loading.gif', '"../images/loading.gif"'],
['../img/loading-sm.gif', '"../images/loading-sm.gif"']
];
elixir(function(mix) {
@ -62,13 +62,13 @@ elixir(function(mix) {
.copy([
'resources/src/bower_components/bootstrap/dist/fonts/**',
'resources/src/bower_components/font-awesome/fonts/**'
], 'resources/fonts/')
], 'resources/dist/fonts/')
.copy([
'resources/src/bower_components/iCheck/skins/square/blue.png',
'resources/src/bower_components/iCheck/skins/square/blue@2x.png',
'resources/src/bower_components/bootstrap-fileinput/img/loading.gif',
'resources/src/bower_components/bootstrap-fileinput/img/loading-sm.gif'
], 'resources/images/')
], 'resources/dist/images/')
.task('sass')
.task('uglify');

View File

@ -1,3 +0,0 @@
*
!public/
!.gitignore

View File

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 382 KiB

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 518 KiB

After

Width:  |  Height:  |  Size: 518 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B

View File

@ -2,24 +2,24 @@
* @Author: printempw
* @Date: 2016-06-04 20:55:09
* @Last Modified by: printempw
* @Last Modified time: 2016-09-14 22:35:45
* @Last Modified time: 2016-09-24 23:45:26
*/
$font_stack: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif;
@font-face {
font-family: 'Ubuntu';
src: url('../../fonts/ubuntu.woff2') format('woff2');
src: url('../fonts/ubuntu.woff2') format('woff2');
}
@font-face {
font-family: 'Minecraft';
src: url('../../fonts/minecraft.eot');
src: url('../../fonts/minecraft.eot') format('embedded-opentype'),
url('../../fonts/minecraft.woff2') format('woff2'),
url('../../fonts/minecraft.woff') format('woff'),
url('../../fonts/minecraft.ttf') format('truetype'),
url('../../fonts/minecraft.svg#minecraft') format('svg');
src: url('../fonts/minecraft.eot');
src: url('../fonts/minecraft.eot') format('embedded-opentype'),
url('../fonts/minecraft.woff2') format('woff2'),
url('../fonts/minecraft.woff') format('woff'),
url('../fonts/minecraft.ttf') format('truetype'),
url('../fonts/minecraft.svg#minecraft') format('svg');
}
body, h1, h2, h3, h4, h5, h6, .logo {