e2m
/
dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Concat css

This commit is contained in:
khlieng 2015-05-12 23:50:55 +02:00
parent 6b6a1172f9
commit 92de7cb8ef
6 changed files with 73 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/gulpfile.js
View File

@ -7,6 +7,7 @@ var minifyCSS = require('gulp-minify-css');
var autoprefixer = require('gulp-autoprefixer');
var uglify = require('gulp-uglify');
var gzip = require('gulp-gzip');
var concat = require('gulp-concat');
var browserify = require('browserify');
var source = require('vinyl-source-stream');
var streamify = require('gulp-streamify');
@ -29,10 +30,11 @@ gulp.task('html', function() {
});
gulp.task('css', function() {
gulp.src('src/css/*.css')
gulp.src(['src/css/fontello.css', 'src/css/style.css'])
.pipe(concat('bundle.css'))
.pipe(autoprefixer())
.pipe(minifyCSS())
.pipe(gulp.dest('dist/css'));
.pipe(gulp.dest('dist'));
});
gulp.task('js', function() {

3
client/package.json
View File

@ -17,7 +17,8 @@
"browserify": "~8.0.3",
"gulp-autoprefixer": "~2.0.0",
"gulp-gzip": "0.0.8",
"babelify": "~5.0.3"
"babelify": "~5.0.3",
"gulp-concat": "~2.5.2"
},
"dependencies": {
"lodash": "3.2.0",

10
client/src/css/fontello.css vendored
View File

@ -1,10 +1,10 @@
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?73444496');
src: url('../font/fontello.eot?73444496#iefix') format('embedded-opentype'),
url('../font/fontello.woff?73444496') format('woff'),
url('../font/fontello.ttf?73444496') format('truetype'),
url('../font/fontello.svg?73444496#fontello') format('svg');
src: url('font/fontello.eot?73444496');
src: url('font/fontello.eot?73444496#iefix') format('embedded-opentype'),
url('font/fontello.woff?73444496') format('woff'),
url('font/fontello.ttf?73444496') format('truetype'),
url('font/fontello.svg?73444496#fontello') format('svg');
font-weight: normal;
font-style: normal;
}

3
client/src/index.html
View File

@ -7,8 +7,7 @@
<title>IRC</title>
<link href="//fonts.googleapis.com/css?family=Montserrat|Droid+Sans+Mono" rel="stylesheet">
<link href="css/fontello.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<link href="bundle.css" rel="stylesheet">
</head>
<body>
<script src="bundle.js"></script>

168
server/bindata.go
View File

File diff suppressed because one or more lines are too long

3
server/server.go
View File

@ -43,8 +43,7 @@ func Run(port int) {
files = []File{
File{"/bundle.js", "text/javascript"},
File{"/css/style.css", "text/css"},
File{"/css/fontello.css", "text/css"},
File{"/bundle.css", "text/css"},
File{"/font/fontello.eot", "application/vnd.ms-fontobject"},
File{"/font/fontello.svg", "image/svg+xml"},
File{"/font/fontello.ttf", "application/x-font-ttf"},