Permalink
Browse files

Merge remote-tracking branch 'honoka/master'

  • Loading branch information...
2 parents 153193e + 65da86d commit 06842bb842679774313105d58d93aacae2cfca65 @NKMR6194 committed Dec 18, 2016
View
@@ -1,5 +1,8 @@
language: node_js
+notifications:
+ email: false
+
node_js:
- '6.9'
View
@@ -81,9 +81,9 @@ module.exports = function(grunt) {
},
files: [{
expand: true,
- cwd: 'src/scss',
+ cwd: 'docs/assets/scss',
src: ['**/*.scss'],
- dest: 'dist/assets/css/',
+ dest: 'docs/assets/css/',
ext: '.css'
}]
}
@@ -99,9 +99,9 @@ module.exports = function(grunt) {
},
assets: {
expand: true,
- cwd: 'dist/assets/css/',
+ cwd: 'docs/assets/css/',
src: ['**/*.css'],
- dest: 'dist/assets/css',
+ dest: 'docs/assets/css',
ext: '.css'
}
},
@@ -113,9 +113,9 @@ module.exports = function(grunt) {
},
assets: {
expand: true,
- cwd: 'dist/assets/css/',
+ cwd: 'docs/assets/css/',
src: ['**/*.css'],
- dest: 'dist/assets/css',
+ dest: 'docs/assets/css',
ext: '.css'
}
},
@@ -128,7 +128,7 @@ module.exports = function(grunt) {
colorizeOutput: true
},
bootstrap: ['scss/**/*.scss'],
- assets: ['src/scss/**/*.scss']
+ assets: ['docs/assets/scss/**/*.scss']
},
// clean
clean: {
@@ -151,8 +151,16 @@ module.exports = function(grunt) {
watch: {
// 自動コンパイル
bootstrap: {
- files: ['scss/**/*.scss', 'src/scss/**/*.scss'],
- tasks: ['scsslint', 'css']
+ files: ['scss/**/*.scss', 'docs/assets/scss/**/*.scss'],
+ tasks: ['scsslint', 'css', 'csscomb', 'copy:docs']
+ }
+ },
+ copy: {
+ docs: {
+ expand: true,
+ cwd: 'dist/',
+ src: ['{css,fonts,js}/**/*'],
+ dest: 'docs/'
}
},
// テストサーバ
@@ -161,7 +169,7 @@ module.exports = function(grunt) {
options: {
port: 8000,
hostname: '*',
- base: 'dist'
+ base: 'docs'
}
}
},
@@ -195,7 +203,7 @@ module.exports = function(grunt) {
{
// Sample html
expand: true,
- cwd: "dist/",
+ cwd: "docs/",
src: ["bootstrap.html"],
dest: name
},
@@ -240,16 +248,16 @@ module.exports = function(grunt) {
grunt.registerTask('test', ['scsslint']);
// CSSビルド
- grunt.registerTask('css', ['sass', 'autoprefixer']);
+ grunt.registerTask('css', ['sass', 'autoprefixer', 'csscomb']);
// 最適化
- grunt.registerTask('optimize', ['csscomb', 'cssmin:minify']);
+ grunt.registerTask('optimize', ['cssmin:minify']);
// 開発用
- grunt.registerTask('server', ['bower:install', 'getTwbsConfig', 'test', 'css', 'connect', 'watch']);
+ grunt.registerTask('server', ['bower:install', 'getTwbsConfig', 'test', 'css', 'copy:docs', 'connect', 'watch']);
// ビルドタスク
- grunt.registerTask('build', ['clean:build', 'bower:install', 'getTwbsConfig', 'test', 'css', 'optimize', 'replace:banner']);
+ grunt.registerTask('build', ['clean:build', 'bower:install', 'getTwbsConfig', 'test', 'css', 'optimize', 'replace:banner', 'copy:docs']);
// 配布用パッケージ作成
grunt.registerTask('package', ['build', 'compress:main']);
View
@@ -6,7 +6,7 @@
[https://nkmr6194.github.io/Umi/](https://nkmr6194.github.io/Umi/)
-[![umi](dist/assets/img/sample.png)](https://nkmr6194.github.io/Umi/)
+[![umi](docs/assets/img/sample.png)](https://nkmr6194.github.io/Umi/)
"Umi" は "Honoka"を元にした日本語も美しく表示できるBootstrapテーマです。
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 06842bb

Please sign in to comment.