From 7ce6fec40c3bb93a8473cd63fc187a3a5a388662 Mon Sep 17 00:00:00 2001 From: life Date: Sun, 25 Dec 2016 14:53:47 +0800 Subject: [PATCH] Gulp parse less --- .gitignore | 5 +- dev/gulpfile.js | 34 + dev/package.json | 19 + login.html | 6 +- note.html | 7 +- public/{css => css-libs}/bootstrap.css | 0 .../font-awesome-4.2.0/css/font-awesome.css | 0 .../css/font-awesome.min.css | 0 .../font-awesome-4.2.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../ztree}/img/diy/1_close.png | Bin .../ztree}/img/diy/1_open.png | Bin .../ztree}/img/diy/2.png | Bin .../ztree}/img/diy/3.png | Bin .../ztree}/img/diy/4.png | Bin .../ztree}/img/diy/5.png | Bin .../ztree}/img/diy/6.png | Bin .../ztree}/img/diy/7.png | Bin .../ztree}/img/diy/8.png | Bin .../ztree}/img/diy/9.png | Bin .../ztree}/img/left_menuForOutLook.gif | Bin .../ztree}/img/left_menuForOutLook.png | Bin .../ztree}/img/line_conn.gif | Bin .../ztree}/img/loading.gif | Bin .../ztree}/img/zTreeStandard.gif | Bin .../ztree}/img/zTreeStandard.png | Bin .../ztree}/zTreeStyle.css | 0 public/css/bootstrap-theme.css | 459 --- public/css/bootstrap-theme.min.css | 9 - public/css/bootstrap.min.css | 9 - public/css/editor/editor.css | 30 +- .../less/bordered-pulled.less | 16 - public/css/font-awesome-4.2.0/less/core.less | 11 - .../font-awesome-4.2.0/less/fixed-width.less | 6 - .../font-awesome-4.2.0/less/font-awesome.less | 17 - public/css/font-awesome-4.2.0/less/icons.less | 552 --- .../css/font-awesome-4.2.0/less/larger.less | 13 - public/css/font-awesome-4.2.0/less/list.less | 19 - .../css/font-awesome-4.2.0/less/mixins.less | 25 - public/css/font-awesome-4.2.0/less/path.less | 14 - .../less/rotated-flipped.less | 20 - .../css/font-awesome-4.2.0/less/spinning.less | 29 - .../css/font-awesome-4.2.0/less/stacked.less | 20 - .../font-awesome-4.2.0/less/variables.less | 561 --- .../scss/_bordered-pulled.scss | 16 - public/css/font-awesome-4.2.0/scss/_core.scss | 11 - .../font-awesome-4.2.0/scss/_fixed-width.scss | 6 - .../css/font-awesome-4.2.0/scss/_icons.scss | 552 --- .../css/font-awesome-4.2.0/scss/_larger.scss | 13 - public/css/font-awesome-4.2.0/scss/_list.scss | 19 - .../css/font-awesome-4.2.0/scss/_mixins.scss | 25 - public/css/font-awesome-4.2.0/scss/_path.scss | 14 - .../scss/_rotated-flipped.scss | 20 - .../font-awesome-4.2.0/scss/_spinning.scss | 29 - .../css/font-awesome-4.2.0/scss/_stacked.scss | 20 - .../font-awesome-4.2.0/scss/_variables.scss | 561 --- .../font-awesome-4.2.0/scss/font-awesome.scss | 17 - public/css/{ => includes}/ani.less | 0 public/css/{ => includes}/traffic.less | 0 public/css/index.css | 825 ----- public/css/{index.less => login.less} | 4 +- public/css/normalize.css | 419 --- public/css/windows.css | 23 +- public/themes/basic.less | 33 +- public/themes/default.css | 3170 +---------------- public/themes/default.less | 15 +- public/themes/includes/markdown.less | 2 + public/themes/includes/vars.less | 34 + public/themes/presentation.css | 366 +- public/themes/themes/black/theme.css | 64 +- public/themes/themes/blue/theme.css | 67 +- public/themes/themes/grass/theme.css | 66 +- public/themes/themes/grass/theme.less | 65 + public/themes/themes/night/theme.css | 441 +-- public/themes/themes/pebbles/theme.css | 66 +- public/themes/themes/pebbles/theme.less | 65 + public/themes/themes/pebbles_night/theme.css | 445 +-- public/themes/themes/vegetables/theme.css | 66 +- public/themes/themes/vegetables/theme.less | 65 + public/themes/themes/volumn/theme.css | 444 +-- public/themes/themes/water/theme.css | 66 +- public/themes/themes/water/theme.less | 65 + public/themes/themes/water_night/theme.css | 445 +-- public/themes/themes/wheat/theme.css | 66 +- public/themes/themes/wheat/theme.less | 65 + public/themes/themes/wood/theme.css | 66 +- public/themes/themes/wood/theme.less | 65 + public/themes/windows.css | 84 +- public/themes/writting.css | 170 +- 92 files changed, 513 insertions(+), 10508 deletions(-) create mode 100755 dev/gulpfile.js create mode 100644 dev/package.json rename public/{css => css-libs}/bootstrap.css (100%) rename public/{css => css-libs}/font-awesome-4.2.0/css/font-awesome.css (100%) rename public/{css => css-libs}/font-awesome-4.2.0/css/font-awesome.min.css (100%) rename public/{css => css-libs}/font-awesome-4.2.0/fonts/FontAwesome.otf (100%) rename public/{css => css-libs}/font-awesome-4.2.0/fonts/fontawesome-webfont.eot (100%) rename public/{css => css-libs}/font-awesome-4.2.0/fonts/fontawesome-webfont.svg (100%) rename public/{css => css-libs}/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf (100%) rename public/{css => css-libs}/font-awesome-4.2.0/fonts/fontawesome-webfont.woff (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/1_close.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/1_open.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/2.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/3.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/4.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/5.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/6.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/7.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/8.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/diy/9.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/left_menuForOutLook.gif (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/left_menuForOutLook.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/line_conn.gif (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/loading.gif (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/zTreeStandard.gif (100%) rename public/{css/zTreeStyle => css-libs/ztree}/img/zTreeStandard.png (100%) rename public/{css/zTreeStyle => css-libs/ztree}/zTreeStyle.css (100%) delete mode 100644 public/css/bootstrap-theme.css delete mode 100644 public/css/bootstrap-theme.min.css delete mode 100644 public/css/bootstrap.min.css delete mode 100644 public/css/font-awesome-4.2.0/less/bordered-pulled.less delete mode 100644 public/css/font-awesome-4.2.0/less/core.less delete mode 100644 public/css/font-awesome-4.2.0/less/fixed-width.less delete mode 100644 public/css/font-awesome-4.2.0/less/font-awesome.less delete mode 100644 public/css/font-awesome-4.2.0/less/icons.less delete mode 100644 public/css/font-awesome-4.2.0/less/larger.less delete mode 100644 public/css/font-awesome-4.2.0/less/list.less delete mode 100644 public/css/font-awesome-4.2.0/less/mixins.less delete mode 100644 public/css/font-awesome-4.2.0/less/path.less delete mode 100644 public/css/font-awesome-4.2.0/less/rotated-flipped.less delete mode 100644 public/css/font-awesome-4.2.0/less/spinning.less delete mode 100644 public/css/font-awesome-4.2.0/less/stacked.less delete mode 100644 public/css/font-awesome-4.2.0/less/variables.less delete mode 100644 public/css/font-awesome-4.2.0/scss/_bordered-pulled.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_core.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_fixed-width.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_icons.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_larger.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_list.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_mixins.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_path.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_rotated-flipped.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_spinning.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_stacked.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/_variables.scss delete mode 100644 public/css/font-awesome-4.2.0/scss/font-awesome.scss rename public/css/{ => includes}/ani.less (100%) rename public/css/{ => includes}/traffic.less (100%) delete mode 100644 public/css/index.css rename public/css/{index.less => login.less} (99%) delete mode 100644 public/css/normalize.css create mode 100644 public/themes/includes/vars.less create mode 100644 public/themes/themes/grass/theme.less create mode 100644 public/themes/themes/pebbles/theme.less create mode 100644 public/themes/themes/vegetables/theme.less create mode 100644 public/themes/themes/water/theme.less create mode 100644 public/themes/themes/wheat/theme.less create mode 100644 public/themes/themes/wood/theme.less diff --git a/.gitignore b/.gitignore index 4ad734c3..d3c28030 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,6 @@ node_modules/fs.extra /updates /old - -public/config.js +/public/themes/**/*.css +/public/css/**/*.css +/dev/node_modules \ No newline at end of file diff --git a/dev/gulpfile.js b/dev/gulpfile.js new file mode 100755 index 00000000..8135a96b --- /dev/null +++ b/dev/gulpfile.js @@ -0,0 +1,34 @@ +'use strict'; + +var fs = require('fs') +var path = require('path') +var gulp = require('gulp') +var gutil = require('gulp-util') +var less = require('gulp-less'); +var cleanCSS = require('gulp-clean-css'); + +var styleDir = '../public/themes'; +var styleDir2 = '../public/css'; + +// 解析less +gulp.task('less', function() { + gulp.src(styleDir + '/**/*.less') + .pipe(less()) + .pipe(cleanCSS({compatibility: 'ie8', processImportFrom: ['!icon/iconfont.css', '!inhope-icon/style.css']})) + .pipe(gulp.dest(styleDir)) + .pipe(gulp.dest(styleDir)); + + gulp.src(styleDir2 + '/**/*.less') + .pipe(less()) + .pipe(cleanCSS({compatibility: 'ie8', processImportFrom: ['!icon/iconfont.css', '!inhope-icon/style.css']})) + .pipe(gulp.dest(styleDir2)) + .pipe(gulp.dest(styleDir2)); + + gutil.log(gutil.colors.green('less ok')); +}); + +// 开发服务 +gulp.task('dev', ['less'], function() { + gulp.watch(styleDir + '/**/*.less', ['less']); + gulp.watch(styleDir2 + '/**/*.less', ['less']); +}); \ No newline at end of file diff --git a/dev/package.json b/dev/package.json new file mode 100644 index 00000000..6f09f028 --- /dev/null +++ b/dev/package.json @@ -0,0 +1,19 @@ +{ + "name": "leanote-desktop-app-dev-package", + "version": "1.0.0", + "private": true, + "devDependencies": { + "gulp": "^3.9.1", + "gulp-clean-css": "^2.3.2", + "gulp-concat": "", + "gulp-less": "^3.3.0", + "gulp-rename": "^1.0", + "gulp-uglify": "^1.0.0", + "gulp-util": "^3.0.1" + }, + "author": "life(http://life.leanote.com)", + "license": "GPL v2", + "bugs": { + "url": "https://github.com/leanote/desktop-app/issues" + } +} diff --git a/login.html b/login.html index f82cc92b..e38dfde4 100644 --- a/login.html +++ b/login.html @@ -8,9 +8,9 @@ Leanote login - - - + + +