Merge branch 'master' of ssh://serwer.magico.pl:2221/public/front.admin
This commit is contained in:
+1
-1
@@ -28,7 +28,7 @@ const fileinclude = require('gulp-file-include');
|
|||||||
const rename = require('gulp-rename');
|
const rename = require('gulp-rename');
|
||||||
const cached = require('gulp-cached')
|
const cached = require('gulp-cached')
|
||||||
const replace = require('gulp-replace');
|
const replace = require('gulp-replace');
|
||||||
const sass = require('gulp-sass')
|
const sass = require('gulp-sass')(require('sass'));
|
||||||
const autoprefixer = require('gulp-autoprefixer');
|
const autoprefixer = require('gulp-autoprefixer');
|
||||||
const rtlcss = require('gulp-rtlcss');
|
const rtlcss = require('gulp-rtlcss');
|
||||||
|
|
||||||
|
|||||||
Generated
+2864
-1162
File diff suppressed because it is too large
Load Diff
+3
-2
@@ -23,7 +23,7 @@
|
|||||||
"gulp-rename": "^1.4.0",
|
"gulp-rename": "^1.4.0",
|
||||||
"gulp-replace": "^1.1.3",
|
"gulp-replace": "^1.1.3",
|
||||||
"gulp-rtlcss": "^1.4.2",
|
"gulp-rtlcss": "^1.4.2",
|
||||||
"gulp-sass": "^4.1.1",
|
"gulp-sass": "^5.1.0",
|
||||||
"gulp-uglify-es": "^2.0.0",
|
"gulp-uglify-es": "^2.0.0",
|
||||||
"puppeteer": "^10.1.0"
|
"puppeteer": "^10.1.0"
|
||||||
},
|
},
|
||||||
@@ -53,9 +53,10 @@
|
|||||||
"jszip": "^3.6.0",
|
"jszip": "^3.6.0",
|
||||||
"leaflet": "^1.6.0",
|
"leaflet": "^1.6.0",
|
||||||
"list.js": "^2.3.1",
|
"list.js": "^2.3.1",
|
||||||
"node-sass": "^4.14.1",
|
"node-sass": "^7.0.1",
|
||||||
"pdfmake": "^0.1.72",
|
"pdfmake": "^0.1.72",
|
||||||
"quill": "^1.3.7",
|
"quill": "^1.3.7",
|
||||||
|
"sass": "^1.50.0",
|
||||||
"sortablejs": "^1.14.0",
|
"sortablejs": "^1.14.0",
|
||||||
"tom-select": "^1.7.6"
|
"tom-select": "^1.7.6"
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
+2614
-2311
File diff suppressed because it is too large
Load Diff
+2586
-2284
File diff suppressed because it is too large
Load Diff
@@ -2001,7 +2001,7 @@ $device-browser-header-btn-list-btn-bg-color: $gray-300 !default;
|
|||||||
$device-browser-header-browser-bar-bg-color: $gray-300 !default;
|
$device-browser-header-browser-bar-bg-color: $gray-300 !default;
|
||||||
|
|
||||||
// Borders
|
// Borders
|
||||||
$device-browser-border-radius: .5rem !default
|
$device-browser-border-radius: .5rem !default;
|
||||||
$device-browser-header-border-width: $border-width !default;
|
$device-browser-header-border-width: $border-width !default;
|
||||||
$device-browser-header-border-color: lighten($gray-300, 3%) !default;
|
$device-browser-header-border-color: lighten($gray-300, 3%) !default;
|
||||||
$device-browser-header-btn-list-btn-border-radius: $border-radius-rounded !default;
|
$device-browser-header-btn-list-btn-border-radius: $border-radius-rounded !default;
|
||||||
@@ -2697,7 +2697,7 @@ $fullcalendar-popover-border-radius: $card-border-radius
|
|||||||
$fullcalendar-daygrid-day-height: 10rem !default;
|
$fullcalendar-daygrid-day-height: 10rem !default;
|
||||||
$fullcalendar-daygrid-day-number-width: $icon-width-sm !default;
|
$fullcalendar-daygrid-day-number-width: $icon-width-sm !default;
|
||||||
$fullcalendar-daygrid-day-number-height: $fullcalendar-daygrid-day-number-width !default;
|
$fullcalendar-daygrid-day-number-height: $fullcalendar-daygrid-day-number-width !default;
|
||||||
$fullcalendar-event-max-width-in-day-view: 15rem !default
|
$fullcalendar-event-max-width-in-day-view: 15rem !default;
|
||||||
$fullcalendar-event-popover-width: 25rem !default;
|
$fullcalendar-event-popover-width: 25rem !default;
|
||||||
$fullcalendar-timegrid-now-indicator-arrow-width: .5rem !default;
|
$fullcalendar-timegrid-now-indicator-arrow-width: .5rem !default;
|
||||||
$fullcalendar-timegrid-now-indicator-arrow-height: $fullcalendar-timegrid-now-indicator-arrow-width !default;
|
$fullcalendar-timegrid-now-indicator-arrow-height: $fullcalendar-timegrid-now-indicator-arrow-width !default;
|
||||||
|
|||||||
Reference in New Issue
Block a user