View | Details | Raw Unified | Return to bug 32609
Collapse All | Expand All

(-)a/gulpfile.js (-16 / +23 lines)
Lines 25-35 const rename = require('gulp-rename'); Link Here
25
const STAFF_CSS_BASE = "koha-tmpl/intranet-tmpl/prog/css";
25
const STAFF_CSS_BASE = "koha-tmpl/intranet-tmpl/prog/css";
26
const OPAC_CSS_BASE = "koha-tmpl/opac-tmpl/bootstrap/css";
26
const OPAC_CSS_BASE = "koha-tmpl/opac-tmpl/bootstrap/css";
27
27
28
if (args.view == "opac") {
28
var CSS_BASE = args.view == "opac"
29
    var css_base = OPAC_CSS_BASE;
29
    ? OPAC_CSS_BASE
30
} else {
30
    : STAFF_CSS_BASE;
31
    var css_base = STAFF_CSS_BASE;
32
}
33
31
34
var sassOptions = {
32
var sassOptions = {
35
    errLogToConsole: true,
33
    errLogToConsole: true,
Lines 41-47 var sassOptions = { Link Here
41
}
39
}
42
40
43
// CSS processing for development
41
// CSS processing for development
44
function css() {
42
function css(css_base) {
43
    css_base = css_base || CSS_BASE
45
    var stream = src(css_base + "/src/**/*.scss")
44
    var stream = src(css_base + "/src/**/*.scss")
46
        .pipe(sourcemaps.init())
45
        .pipe(sourcemaps.init())
47
        .pipe(sass(sassOptions).on('error', sass.logError))
46
        .pipe(sass(sassOptions).on('error', sass.logError))
Lines 65-77 function css() { Link Here
65
}
64
}
66
65
67
// CSS processing for production
66
// CSS processing for production
68
function build() {
67
function build(css_base) {
68
    css_base = css_base || CSS_BASE
69
    var stream = src(css_base + "/src/**/*.scss")
69
    var stream = src(css_base + "/src/**/*.scss")
70
        .pipe(sass(sassOptions).on('error', sass.logError))
70
        .pipe(sass(sassOptions).on('error', sass.logError))
71
        .pipe(autoprefixer())
71
        .pipe(autoprefixer())
72
        .pipe(cssnano({
73
            zindex: false
74
        }))
75
        .pipe(dest(css_base));
72
        .pipe(dest(css_base));
76
73
77
    if( args.view == "opac" ){
74
    if( args.view == "opac" ){
Lines 85-90 function build() { Link Here
85
    return stream;
82
    return stream;
86
}
83
}
87
84
85
function opac_css(){
86
    return css(OPAC_CSS_BASE);
87
}
88
89
function staff_css(){
90
    return css(STAFF_CSS_BASE);
91
}
92
88
const poTasks = {
93
const poTasks = {
89
    'marc-MARC21': {
94
    'marc-MARC21': {
90
        extract: po_extract_marc_marc21,
95
        extract: po_extract_marc_marc21,
Lines 368-380 function getLanguages () { Link Here
368
    return Array.from(new Set(languages));
373
    return Array.from(new Set(languages));
369
}
374
}
370
375
371
exports.build = build;
376
exports.build = function(next){build(); next();};
372
exports.css = css;
377
exports.css = function(next){css(); next();};
378
exports.opac_css = opac_css;
379
exports.staff_css = staff_css;
380
exports.watch = function () {
381
    watch(OPAC_CSS_BASE + "/src/**/*.scss", series('opac_css'));
382
    watch(STAFF_CSS_BASE + "/src/**/*.scss", series('staff_css'));
383
};
373
384
374
exports['po:create'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].create)));
385
exports['po:create'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].create)));
375
exports['po:update'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].update)));
386
exports['po:update'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].update)));
376
exports['po:extract'] = parallel(...poTypes.map(type => poTasks[type].extract));
387
exports['po:extract'] = parallel(...poTypes.map(type => poTasks[type].extract));
377
378
exports.default = function () {
379
    watch(css_base + "/src/**/*.scss", series('css'));
380
}
(-)a/package.json (-6 / +8 lines)
Lines 40-50 Link Here
40
    "vue-select": "4.0.0-beta.3"
40
    "vue-select": "4.0.0-beta.3"
41
  },
41
  },
42
  "scripts": {
42
  "scripts": {
43
    "build": "gulp build",
43
    "css:build": "gulp css && gulp css --opac",
44
    "build_js": "webpack --mode production",
44
    "css:build:prod": "gulp build && gulp css --opac",
45
    "watch_js": "webpack --mode development --watch",
45
    "css:watch": "gulp watch",
46
    "css": "gulp css",
46
    "js:build": "webpack --mode development",
47
    "watch": "gulp watch",
47
    "js:watch": "webpack --mode development --watch",
48
    "js:build:prod": "webpack --mode production",
49
    "build": "yarn css:build && yarn js:build",
50
    "build:prod": "yarn css:build:prod && yarn js:build:prod",
48
    "cypress": "cypress",
51
    "cypress": "cypress",
49
    "prettier": "prettier"
52
    "prettier": "prettier"
50
  },
53
  },
51
- 

Return to bug 32609