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

(-)a/gulpfile.js (-9 / +3 lines)
Lines 9-16 const os = require('os'); Link Here
9
const path = require('path');
9
const path = require('path');
10
const util = require('util');
10
const util = require('util');
11
11
12
const sass = require("gulp-sass");
12
const sass = require('gulp-sass')(require('sass'));
13
const cssnano = require("gulp-cssnano");
14
const rtlcss = require('gulp-rtlcss');
13
const rtlcss = require('gulp-rtlcss');
15
const sourcemaps = require('gulp-sourcemaps');
14
const sourcemaps = require('gulp-sourcemaps');
16
const autoprefixer = require('gulp-autoprefixer');
15
const autoprefixer = require('gulp-autoprefixer');
Lines 30-37 var CSS_BASE = args.view == "opac" Link Here
30
    : STAFF_CSS_BASE;
29
    : STAFF_CSS_BASE;
31
30
32
var sassOptions = {
31
var sassOptions = {
33
    errLogToConsole: true,
34
    precision: 3,
35
    includePaths: [
32
    includePaths: [
36
        __dirname + '/node_modules',
33
        __dirname + '/node_modules',
37
        __dirname + '/../node_modules'
34
        __dirname + '/../node_modules'
Lines 62-77 function css(css_base) { Link Here
62
    return stream;
59
    return stream;
63
60
64
}
61
}
65
66
// CSS processing for production
62
// CSS processing for production
67
function build(css_base) {
63
function build(css_base) {
68
    css_base = css_base || CSS_BASE
64
    css_base = css_base || CSS_BASE;
65
    sassOptions.outputStyle = "compressed";
69
    var stream = src(css_base + "/src/**/*.scss")
66
    var stream = src(css_base + "/src/**/*.scss")
70
        .pipe(sass(sassOptions).on('error', sass.logError))
67
        .pipe(sass(sassOptions).on('error', sass.logError))
71
        .pipe(autoprefixer())
68
        .pipe(autoprefixer())
72
        .pipe(cssnano({
73
            zindex: false
74
        }))
75
        .pipe(dest(css_base));
69
        .pipe(dest(css_base));
76
70
77
    if( args.view == "opac" ){
71
    if( args.view == "opac" ){
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr_vars.scss (-1 / +1 lines)
Lines 3-9 $slideTime: 400ms; Link Here
3
3
4
4
5
$daySize: 39px !default;
5
$daySize: 39px !default;
6
$padding: $daySize / 16;
6
$padding: calc( $daySize / 16 );
7
$dayMargin: 2px !default;
7
$dayMargin: 2px !default;
8
$daysWidth: $daySize * 7 + $dayMargin * 14 + $padding * 2 + 2;
8
$daysWidth: $daySize * 7 + $dayMargin * 14 + $padding * 2 + 2;
9
$calendarWidth: $daysWidth;
9
$calendarWidth: $daysWidth;
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_flatpickr_vars.scss (-2 / +2 lines)
Lines 1-9 Link Here
1
$bezier: cubic-bezier( .23, 1, .32, 1 );
1
$bezier: cubic-bezier( .23, 1, .32, 1 );
2
$slideTime: 400ms;
2
$slideTime: 400ms;
3
$daySize: 39px !default;
3
$daySize: 39px !default;
4
$padding: $daySize / 16;
4
$padding: calc( $daySize / 16 );
5
$dayMargin: 2px !default;
5
$dayMargin: 2px !default;
6
$daysWidth: $daySize * 7 + $dayMargin * 14 + $padding * 2 + 2;
6
$daysWidth: calc( $daySize * 7) + $dayMargin * 14 + $padding * 2 + 2;
7
$calendarWidth: $daysWidth;
7
$calendarWidth: $daysWidth;
8
$monthNavHeight: 34px !default;
8
$monthNavHeight: 34px !default;
9
$weekdaysHeight: 28px !default;
9
$weekdaysHeight: 28px !default;
(-)a/package.json (-8 / +7 lines)
Lines 21-31 Link Here
21
    "gulp": "^4.0.2",
21
    "gulp": "^4.0.2",
22
    "gulp-autoprefixer": "^4.0.0",
22
    "gulp-autoprefixer": "^4.0.0",
23
    "gulp-concat-po": "^1.0.0",
23
    "gulp-concat-po": "^1.0.0",
24
    "gulp-cssnano": "^2.1.2",
25
    "gulp-exec": "^4.0.0",
24
    "gulp-exec": "^4.0.0",
26
    "gulp-rename": "^2.0.0",
25
    "gulp-rename": "^2.0.0",
27
    "gulp-rtlcss": "^1.4.1",
26
    "gulp-rtlcss": "^1.4.1",
28
    "gulp-sass": "^3.1.0",
27
    "gulp-sass": "^5.1.0",
29
    "gulp-sourcemaps": "^2.6.1",
28
    "gulp-sourcemaps": "^2.6.1",
30
    "js-yaml": "^3.13.1",
29
    "js-yaml": "^3.13.1",
31
    "lodash": "^4.17.12",
30
    "lodash": "^4.17.12",
Lines 33-38 Link Here
33
    "minimist": "^1.2.5",
32
    "minimist": "^1.2.5",
34
    "mysql": "^2.18.1",
33
    "mysql": "^2.18.1",
35
    "pinia": "^2.0.13",
34
    "pinia": "^2.0.13",
35
    "sass": "^1.58.1",
36
    "style-loader": "^3.3.1",
36
    "style-loader": "^3.3.1",
37
    "vue": "^3.2.31",
37
    "vue": "^3.2.31",
38
    "vue-flatpickr-component": "^9",
38
    "vue-flatpickr-component": "^9",
Lines 63-73 Link Here
63
  "author": "",
63
  "author": "",
64
  "license": "GPL-3.0",
64
  "license": "GPL-3.0",
65
  "devDependencies": {
65
  "devDependencies": {
66
    "postcss-selector-parser": "^6.0.10",
67
    "postcss": "^8.4.14",
68
    "stylelint-config-standard-scss": "^5.0.0",
69
    "stylelint-order": "^5.0.0",
70
    "stylelint": "^14.9.1",
71
    "@babel/core": "^7.17.5",
66
    "@babel/core": "^7.17.5",
72
    "@babel/preset-env": "^7.16.11",
67
    "@babel/preset-env": "^7.16.11",
73
    "@vue/compiler-sfc": "^3.2.31",
68
    "@vue/compiler-sfc": "^3.2.31",
Lines 77-82 Link Here
77
    "clean-webpack-plugin": "^4.0.0",
72
    "clean-webpack-plugin": "^4.0.0",
78
    "gulp-tap": "^1.0.1",
73
    "gulp-tap": "^1.0.1",
79
    "html-webpack-plugin": "^5.5.0",
74
    "html-webpack-plugin": "^5.5.0",
75
    "postcss": "^8.4.14",
76
    "postcss-selector-parser": "^6.0.10",
77
    "stylelint": "^14.9.1",
78
    "stylelint-config-standard-scss": "^5.0.0",
79
    "stylelint-order": "^5.0.0",
80
    "ts-loader": "^9.2.7",
80
    "ts-loader": "^9.2.7",
81
    "typescript": "^4.6.2",
81
    "typescript": "^4.6.2",
82
    "vinyl-source-stream": "^2.0.0",
82
    "vinyl-source-stream": "^2.0.0",
83
- 

Return to bug 32978