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

(-)a/gulpfile.js (+2 lines)
Lines 11-16 const util = require('util'); Link Here
11
const stream = require('stream/promises');
11
const stream = require('stream/promises');
12
12
13
const sass = require('gulp-sass')(require('sass'));
13
const sass = require('gulp-sass')(require('sass'));
14
const tildeImporter = require('node-sass-tilde-importer');
14
const rtlcss = require('gulp-rtlcss');
15
const rtlcss = require('gulp-rtlcss');
15
const sourcemaps = require('gulp-sourcemaps');
16
const sourcemaps = require('gulp-sourcemaps');
16
const autoprefixer = require('gulp-autoprefixer');
17
const autoprefixer = require('gulp-autoprefixer');
Lines 30-35 var CSS_BASE = args.view == "opac" Link Here
30
    : STAFF_CSS_BASE;
31
    : STAFF_CSS_BASE;
31
32
32
var sassOptions = {
33
var sassOptions = {
34
    importer: tildeImporter,
33
    includePaths: [
35
    includePaths: [
34
        __dirname + '/node_modules',
36
        __dirname + '/node_modules',
35
        __dirname + '/../node_modules'
37
        __dirname + '/../node_modules'
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss (-20 / +20 lines)
Lines 1-32 Link Here
1
// scss-docs-start import-stack
1
// scss-docs-start import-stack
2
// Configuration
2
// Configuration
3
@import "../../../../../node_modules/bootstrap5/scss/functions";
3
@import "~bootstrap5/scss/_functions";
4
4
5
// Include any default variable overrides here
5
// Include any default variable overrides here
6
@import "variables";
6
@import "_variables";
7
7
8
// Include remainder of required Bootstrap stylesheets
8
// Include remainder of required Bootstrap stylesheets
9
@import "../../../../../node_modules/bootstrap5/scss/variables";
9
@import "~bootstrap5/scss/_variables";
10
@import "../../../../../node_modules/bootstrap5/scss/mixins";
10
@import "~bootstrap5/scss/_mixins";
11
11
12
$enable-dark-mode: false;
12
$enable-dark-mode: false;
13
13
14
@import "../../../../../node_modules/bootstrap5/scss/maps";
14
@import "~bootstrap5/scss/_maps";
15
@import "../../../../../node_modules/bootstrap5/scss/utilities";
15
@import "~bootstrap5/scss/_utilities";
16
@import "../../../../../node_modules/bootstrap5/scss/root";
16
@import "~bootstrap5/scss/_root";
17
@import "../../../../../node_modules/bootstrap5/scss/reboot";
17
@import "~bootstrap5/scss/_reboot";
18
@import "../../../../../node_modules/bootstrap5/scss/type";
18
@import "~bootstrap5/scss/_type";
19
@import "../../../../../node_modules/bootstrap5/scss/containers";
19
@import "~bootstrap5/scss/_containers";
20
@import "../../../../../node_modules/bootstrap5/scss/grid";
20
@import "~bootstrap5/scss/_grid";
21
@import "../../../../../node_modules/bootstrap5/scss/forms";
21
@import "~bootstrap5/scss/_forms";
22
@import "../../../../../node_modules/bootstrap5/scss/buttons";
22
@import "~bootstrap5/scss/_buttons";
23
@import "../../../../../node_modules/bootstrap5/scss/transitions";
23
@import "~bootstrap5/scss/_transitions";
24
@import "../../../../../node_modules/bootstrap5/scss/breadcrumb";
24
@import "~bootstrap5/scss/_breadcrumb";
25
@import "../../../../../node_modules/bootstrap5/scss/badge";
25
@import "~bootstrap5/scss/_badge";
26
@import "../../../../../node_modules/bootstrap5/scss/alert";
26
@import "~bootstrap5/scss/_alert";
27
@import "../../../../../node_modules/bootstrap5/scss/helpers";
27
@import "~bootstrap5/scss/_helpers";
28
@import "../../../../../node_modules/bootstrap5/scss/utilities/api";
28
@import "~bootstrap5/scss/_utilities/api";
29
@import "flatpickr";
29
@import "_flatpickr";
30
30
31
body {
31
body {
32
    background-color: #EEE;
32
    background-color: #EEE;
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-46 / +45 lines)
Lines 1-66 Link Here
1
@import "../../../../../node_modules/bootstrap5/scss/mixins/banner";
1
@import "~bootstrap5/scss/mixins/_banner";
2
@import "../../../../../node_modules/bootstrap5/scss/mixins/banner";
2
@import "~bootstrap5/scss/mixins/_banner";
3
@include bsBanner("");
4
3
5
// scss-docs-start import-stack
4
// scss-docs-start import-stack
5
@import "~bootstrap5/scss/_functions";
6
// Configuration
6
// Configuration
7
@import "../../../../../node_modules/bootstrap5/scss/functions";
8
// Include any default variable overrides here
7
// Include any default variable overrides here
9
@import "variables";
8
@import "_variables";
10
9
11
// Include remainder of required Bootstrap stylesheets
10
// Include remainder of required Bootstrap stylesheets
12
@import "../../../../../node_modules/bootstrap5/scss/variables";
11
@import "~bootstrap5/scss/_variables";
13
@import "../../../../../node_modules/bootstrap5/scss/mixins";
12
@import "~bootstrap5/scss/_mixins";
14
13
15
$enable-dark-mode: false;
14
$enable-dark-mode: false;
16
15
17
@import "../../../../../node_modules/bootstrap5/scss/maps";
16
@import "~bootstrap5/scss/_maps";
18
@import "../../../../../node_modules/bootstrap5/scss/utilities";
17
@import "~bootstrap5/scss/_utilities";
19
18
20
// Layout & components
19
// Layout & components
21
@import "../../../../../node_modules/bootstrap5/scss/root";
20
@import "~bootstrap5/scss/_root";
22
@import "../../../../../node_modules/bootstrap5/scss/reboot";
21
@import "~bootstrap5/scss/_reboot";
23
@import "../../../../../node_modules/bootstrap5/scss/type";
22
@import "~bootstrap5/scss/_type";
24
@import "../../../../../node_modules/bootstrap5/scss/images";
23
@import "~bootstrap5/scss/_images";
25
@import "../../../../../node_modules/bootstrap5/scss/containers";
24
@import "~bootstrap5/scss/_containers";
26
@import "../../../../../node_modules/bootstrap5/scss/grid";
25
@import "~bootstrap5/scss/_grid";
27
@import "../../../../../node_modules/bootstrap5/scss/tables";
26
@import "~bootstrap5/scss/_tables";
28
@import "../../../../../node_modules/bootstrap5/scss/forms";
27
@import "~bootstrap5/scss/_forms";
29
@import "../../../../../node_modules/bootstrap5/scss/buttons";
28
@import "~bootstrap5/scss/_buttons";
30
@import "../../../../../node_modules/bootstrap5/scss/transitions";
29
@import "~bootstrap5/scss/_transitions";
31
@import "../../../../../node_modules/bootstrap5/scss/dropdown";
30
@import "~bootstrap5/scss/_dropdown";
32
@import "../../../../../node_modules/bootstrap5/scss/button-group";
31
@import "~bootstrap5/scss/_button-group";
33
@import "../../../../../node_modules/bootstrap5/scss/nav";
32
@import "~bootstrap5/scss/_nav";
34
@import "../../../../../node_modules/bootstrap5/scss/navbar";
33
@import "~bootstrap5/scss/_navbar";
35
@import "../../../../../node_modules/bootstrap5/scss/card";
34
@import "~bootstrap5/scss/_card";
36
@import "../../../../../node_modules/bootstrap5/scss/accordion";
35
@import "~bootstrap5/scss/_accordion";
37
@import "../../../../../node_modules/bootstrap5/scss/breadcrumb";
36
@import "~bootstrap5/scss/_breadcrumb";
38
@import "../../../../../node_modules/bootstrap5/scss/pagination";
37
@import "~bootstrap5/scss/_pagination";
39
@import "../../../../../node_modules/bootstrap5/scss/badge";
38
@import "~bootstrap5/scss/_badge";
40
@import "../../../../../node_modules/bootstrap5/scss/alert";
39
@import "~bootstrap5/scss/_alert";
41
@import "../../../../../node_modules/bootstrap5/scss/progress";
40
@import "~bootstrap5/scss/_progress";
42
@import "../../../../../node_modules/bootstrap5/scss/list-group";
41
@import "~bootstrap5/scss/_list-group";
43
@import "../../../../../node_modules/bootstrap5/scss/close";
42
@import "~bootstrap5/scss/_close";
44
@import "../../../../../node_modules/bootstrap5/scss/toasts";
43
@import "~bootstrap5/scss/_toasts";
45
@import "../../../../../node_modules/bootstrap5/scss/modal";
44
@import "~bootstrap5/scss/_modal";
46
@import "../../../../../node_modules/bootstrap5/scss/tooltip";
45
@import "~bootstrap5/scss/_tooltip";
47
@import "../../../../../node_modules/bootstrap5/scss/popover";
46
@import "~bootstrap5/scss/_popover";
48
@import "../../../../../node_modules/bootstrap5/scss/carousel";
47
@import "~bootstrap5/scss/_carousel";
49
@import "../../../../../node_modules/bootstrap5/scss/spinners";
48
@import "~bootstrap5/scss/_spinners";
50
@import "../../../../../node_modules/bootstrap5/scss/offcanvas";
49
@import "~bootstrap5/scss/_offcanvas";
51
@import "../../../../../node_modules/bootstrap5/scss/placeholders";
50
@import "~bootstrap5/scss/_placeholders";
52
51
53
// Helpers
52
// Helpers
54
@import "../../../../../node_modules/bootstrap5/scss/helpers";
53
@import "~bootstrap5/scss/_helpers";
55
54
56
// Utilities
55
// Utilities
57
@import "../../../../../node_modules/bootstrap5/scss/utilities/api";
56
@import "~bootstrap5/scss/utilities/_api";
58
// scss-docs-end import-stack
57
// scss-docs-end import-stack
59
58
60
@import "mixins";
59
@import "_mixins";
61
@import "tables";
60
@import "_tables";
62
@import "flatpickr";
61
@import "_flatpickr";
63
@import "fonts";
62
@import "_fonts";
64
63
65
.btn-default {
64
.btn-default {
66
    @include button-variant(
65
    @include button-variant(
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss (-43 / +42 lines)
Lines 36-105 $high-contrast-grey: #666666; Link Here
36
    box-shadow: inset 0 1px 1px rgba( 0, 0, 0, .075 ), 0 0 8px rgba( 194, 228, 136, .6 );
36
    box-shadow: inset 0 1px 1px rgba( 0, 0, 0, .075 ), 0 0 8px rgba( 194, 228, 136, .6 );
37
}
37
}
38
38
39
@import "../../../../../node_modules/bootstrap5/scss/mixins/banner";
39
@import "~bootstrap5/scss/mixins/_banner";
40
@include bsBanner("");
41
40
42
// scss-docs-start import-stack
41
// scss-docs-start import-stack
43
// Configuration
42
// Configuration
44
@import "../../../../../node_modules/bootstrap5/scss/functions";
43
@import "~bootstrap5/scss/_functions";
45
44
46
// Include any default variable overrides here
45
// Include any default variable overrides here
47
@import "variables";
46
@import "_variables";
48
47
49
// Include remainder of required Bootstrap stylesheets
48
// Include remainder of required Bootstrap stylesheets
50
@import "../../../../../node_modules/bootstrap5/scss/variables";
49
@import "~bootstrap5/scss/_variables";
51
@import "../../../../../node_modules/bootstrap5/scss/mixins";
50
@import "~bootstrap5/scss/_mixins";
52
51
53
$enable-dark-mode: false;
52
$enable-dark-mode: false;
54
53
55
@import "../../../../../node_modules/bootstrap5/scss/maps";
54
@import "~bootstrap5/scss/_maps";
56
@import "../../../../../node_modules/bootstrap5/scss/utilities";
55
@import "~bootstrap5/scss/_utilities";
57
56
58
// Layout & components
57
// Layout & components
59
@import "../../../../../node_modules/bootstrap5/scss/root";
58
@import "~bootstrap5/scss/_root";
60
@import "../../../../../node_modules/bootstrap5/scss/reboot";
59
@import "~bootstrap5/scss/_reboot";
61
@import "../../../../../node_modules/bootstrap5/scss/type";
60
@import "~bootstrap5/scss/_type";
62
@import "../../../../../node_modules/bootstrap5/scss/images";
61
@import "~bootstrap5/scss/_images";
63
@import "../../../../../node_modules/bootstrap5/scss/containers";
62
@import "~bootstrap5/scss/_containers";
64
@import "../../../../../node_modules/bootstrap5/scss/grid";
63
@import "~bootstrap5/scss/_grid";
65
@import "../../../../../node_modules/bootstrap5/scss/tables";
64
@import "~bootstrap5/scss/_tables";
66
@import "../../../../../node_modules/bootstrap5/scss/forms";
65
@import "~bootstrap5/scss/_forms";
67
@import "../../../../../node_modules/bootstrap5/scss/buttons";
66
@import "~bootstrap5/scss/_buttons";
68
@import "../../../../../node_modules/bootstrap5/scss/transitions";
67
@import "~bootstrap5/scss/_transitions";
69
@import "../../../../../node_modules/bootstrap5/scss/dropdown";
68
@import "~bootstrap5/scss/_dropdown";
70
@import "../../../../../node_modules/bootstrap5/scss/button-group";
69
@import "~bootstrap5/scss/_button-group";
71
@import "../../../../../node_modules/bootstrap5/scss/nav";
70
@import "~bootstrap5/scss/_nav";
72
@import "../../../../../node_modules/bootstrap5/scss/navbar";
71
@import "~bootstrap5/scss/_navbar";
73
@import "../../../../../node_modules/bootstrap5/scss/card";
72
@import "~bootstrap5/scss/_card";
74
@import "../../../../../node_modules/bootstrap5/scss/accordion";
73
@import "~bootstrap5/scss/_accordion";
75
@import "../../../../../node_modules/bootstrap5/scss/breadcrumb";
74
@import "~bootstrap5/scss/_breadcrumb";
76
@import "../../../../../node_modules/bootstrap5/scss/pagination";
75
@import "~bootstrap5/scss/_pagination";
77
@import "../../../../../node_modules/bootstrap5/scss/badge";
76
@import "~bootstrap5/scss/_badge";
78
@import "../../../../../node_modules/bootstrap5/scss/alert";
77
@import "~bootstrap5/scss/_alert";
79
@import "../../../../../node_modules/bootstrap5/scss/progress";
78
@import "~bootstrap5/scss/_progress";
80
@import "../../../../../node_modules/bootstrap5/scss/list-group";
79
@import "~bootstrap5/scss/_list-group";
81
@import "../../../../../node_modules/bootstrap5/scss/close";
80
@import "~bootstrap5/scss/_close";
82
@import "../../../../../node_modules/bootstrap5/scss/toasts";
81
@import "~bootstrap5/scss/_toasts";
83
@import "../../../../../node_modules/bootstrap5/scss/modal";
82
@import "~bootstrap5/scss/_modal";
84
@import "../../../../../node_modules/bootstrap5/scss/tooltip";
83
@import "~bootstrap5/scss/_tooltip";
85
@import "../../../../../node_modules/bootstrap5/scss/popover";
84
@import "~bootstrap5/scss/_popover";
86
@import "../../../../../node_modules/bootstrap5/scss/carousel";
85
@import "~bootstrap5/scss/_carousel";
87
@import "../../../../../node_modules/bootstrap5/scss/spinners";
86
@import "~bootstrap5/scss/_spinners";
88
@import "../../../../../node_modules/bootstrap5/scss/offcanvas";
87
@import "~bootstrap5/scss/_offcanvas";
89
@import "../../../../../node_modules/bootstrap5/scss/placeholders";
88
@import "~bootstrap5/scss/_placeholders";
90
89
91
// Helpers
90
// Helpers
92
@import "../../../../../node_modules/bootstrap5/scss/helpers";
91
@import "~bootstrap5/scss/_helpers";
93
92
94
// Utilities
93
// Utilities
95
@import "../../../../../node_modules/bootstrap5/scss/utilities/api";
94
@import "~bootstrap5/scss/utilities/_api";
96
95
97
// scss-docs-end import-stack
96
// scss-docs-end import-stack
98
97
99
@import "flatpickr";
98
@import "_flatpickr";
100
99
101
/* Koha imports */
100
/* Koha imports */
102
@import "fonts";
101
@import "_fonts";
103
102
104
// Sticky footer styles
103
// Sticky footer styles
105
html,
104
html,
(-)a/package.json (+1 lines)
Lines 81-86 Link Here
81
    "eslint-plugin-prettier": "^5.1.3",
81
    "eslint-plugin-prettier": "^5.1.3",
82
    "gulp-tap": "^1.0.1",
82
    "gulp-tap": "^1.0.1",
83
    "html-webpack-plugin": "^5.5.0",
83
    "html-webpack-plugin": "^5.5.0",
84
    "node-sass-tilde-importer": "^1.0.2",
84
    "postcss": "^8.4.14",
85
    "postcss": "^8.4.14",
85
    "postcss-selector-parser": "^6.0.10",
86
    "postcss-selector-parser": "^6.0.10",
86
    "stylelint": "^14.9.1",
87
    "stylelint": "^14.9.1",
(-)a/yarn.lock (-1 / +12 lines)
Lines 4799-4804 find-cache-dir@^3.3.1: Link Here
4799
    make-dir "^3.0.2"
4799
    make-dir "^3.0.2"
4800
    pkg-dir "^4.1.0"
4800
    pkg-dir "^4.1.0"
4801
4801
4802
find-parent-dir@^0.3.0:
4803
  version "0.3.1"
4804
  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125"
4805
  integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==
4806
4802
find-up@^1.0.0:
4807
find-up@^1.0.0:
4803
  version "1.1.2"
4808
  version "1.1.2"
4804
  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
4809
  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
Lines 7366-7371 node-releases@^2.0.6: Link Here
7366
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
7371
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
7367
  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
7372
  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
7368
7373
7374
node-sass-tilde-importer@^1.0.2:
7375
  version "1.0.2"
7376
  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
7377
  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
7378
  dependencies:
7379
    find-parent-dir "^0.3.0"
7380
7369
nomnom@1.8.1:
7381
nomnom@1.8.1:
7370
  version "1.8.1"
7382
  version "1.8.1"
7371
  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
7383
  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
7372
- 

Return to bug 35402