Skip to content
Permalink
Browse files

change gulp scss

  • Loading branch information...
Boyuzhou
Boyuzhou committed Jan 9, 2017
1 parent f1fdf69 commit 4c34bf048791ae8eb3a7e5b156c91b7aafc0a03c
Showing with 9,919 additions and 36,682 deletions.
  1. +9,527 −36,268 assets/tinper-bee.css
  2. +1 −0 assets/tinper-bee.min.css
  3. +351 −381 build/tinper-bee.js
  4. +21 −21 build/tinper-bee.min.js
  5. +5 −1 gulpfile.js
  6. +12 −10 package.json
  7. +1 −0 server/index.js
  8. +1 −1 views/docs.swig

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -6,6 +6,7 @@ var clean = require('gulp-clean');
var cleancss = require('gulp-cleancss');
var concat = require('gulp-concat');
var autoprefix = require('gulp-autoprefixer');
var minifyCss = require('gulp-minify-css');
var webpack = require('webpack');
var Promise = require('promise');
var git = require('git-rev');
@@ -135,14 +136,17 @@ gulp.task('js_uglify', ['js_build'], function (done) {
});

gulp.task('theme', ['theme_clean'], function (done) {
gulp.src(['./style/*.scss'])
gulp.src(['./style/index.scss'])
.pipe(sass())
.pipe(concat('tinper-bee.css'))
.pipe(autoprefix({
browsers: ['last 2 versions', 'not ie < 8'],
cascade: false
}))
.pipe(gulp.dest('./assets'))
.pipe(minifyCss())
.pipe(concat('tinper-bee.min.css'))
.pipe(gulp.dest('./assets'))
.on('end', function () {
done();
});
@@ -1,6 +1,6 @@
{
"name": "tinper-bee",
"version": "0.2.5",
"version": "0.2.6",
"description": "React Components living for enterprise-class pc backend application",
"main": "build/tinper-bee.js",
"scripts": {
@@ -54,6 +54,7 @@
"gulp-rename": "~1.2.2",
"gulp-sass": "^2.3.2",
"gulp-uglify": "~1.5.3",
"gulp-minify-css": "^1.2.4",
"html-wiring": "^1.2.0",
"inquirer": "~1.0.3",
"istanbul": "^0.4.5",
@@ -84,36 +85,37 @@
"bee-animate": "latest",
"bee-badge": "latest",
"bee-breadcrumb": "latest",
"bee-button": "^0.2.4",
"bee-button": "latest",
"bee-button-group": "latest",
"bee-cascader": "latest",
"bee-checkbox": "latest",
"bee-checkbox": "^0.1.5",
"bee-control-label": "latest",
"bee-dropdown": "^0.2.1",
"bee-form-control": "latest",
"bee-dropdown": "latest",
"bee-form-control": "^0.1.7",
"bee-form-group": "latest",
"bee-icon": "latest",
"bee-input-group": "latest",
"bee-layout": "latest",
"bee-loading": "latest",
"bee-loading-state": "latest",
"bee-loading-state": "^0.1.7",
"bee-menu": "latest",
"bee-message": "latest",
"bee-modal": "latest",
"bee-navbar": "^0.2.0",
"bee-notification": "^0.2.22",
"bee-navbar": "latest",
"bee-notification": "latest",
"bee-pagination": "latest",
"bee-panel": "latest",
"bee-popconfirm": "latest",
"bee-progress-bar": "latest",
"bee-radio": "^0.1.6",
"bee-radio-group": "latest",
"bee-select": "latest",
"bee-switch": "latest",
"bee-tabs": "latest",
"bee-tile": "latest",
"bee-tooltip": "^0.2.2",
"bee-tooltip": "latest",
"bee-transition": "latest",
"bee-upload": "latest",
"bee-upload": "^0.1.3",
"tinper-bee-core": "latest"
}
}
@@ -23,6 +23,7 @@ app.use(logger());

app.use(staticCache(path.join(__dirname, '../static')),{ maxAge: 365 * 24 * 60 * 60});
app.use(staticCache(path.join(__dirname, '../assets')),{ maxAge: 365 * 24 * 60 * 60});
app.use(staticCache(path.join(__dirname, '../style')),{ maxAge: 365 * 24 * 60 * 60});
app.use(staticCache(path.join(__dirname, '../node_modules')),{ maxAge: 365 * 24 * 60 * 60});


@@ -1,7 +1,7 @@
{% extends 'layout/layout.swig' %}

{% block css %}
{#<link href="/tinper-bee.css" type="text/css" rel="stylesheet" />#}
<link href="/tinper-bee.css" type="text/css" rel="stylesheet" />
{% if docId && isComponent==1 %}
<link href="/{{docId}}/dist/demo.css" type="text/css" rel="stylesheet" />
{% endif %}

0 comments on commit 4c34bf0

Please sign in to comment.
You can’t perform that action at this time.