update from master

This commit is contained in:
Vincent BRIDIER 2022-07-08 12:45:58 +02:00
parent febbc9ae81
commit c6a4f35202
8 changed files with 35 additions and 27 deletions

17
package-lock.json generated
View file

@ -4,6 +4,9 @@
"requires": true,
"packages": {
"": {
"dependencies": {
"sweetalert2": "^11.4.20"
},
"devDependencies": {
"@lighting-beetle/glider-js": "^1.8.2",
"@popperjs/core": "^2.11.5",
@ -8431,6 +8434,15 @@
"node": ">=10.13.0"
}
},
"node_modules/sweetalert2": {
"version": "11.4.20",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz",
"integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew==",
"funding": {
"type": "individual",
"url": "https://sweetalert2.github.io/#donations"
}
},
"node_modules/tapable": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@ -15707,6 +15719,11 @@
"stable": "^0.1.8"
}
},
"sweetalert2": {
"version": "11.4.20",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz",
"integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew=="
},
"tapable": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",

View file

@ -27,5 +27,8 @@
"sass-loader": "^8.0.2",
"vue": "^2.6.14",
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
"sweetalert2": "^11.4.20"
}
}

View file

Before

Width:  |  Height:  |  Size: 206 KiB

After

Width:  |  Height:  |  Size: 206 KiB

View file

@ -3,7 +3,7 @@ import Swal from 'sweetalert2'
Swal.fire({
width: 235,
imageUrl: '/loue/img/logo_bogt.png',
imageUrl: '/assets/images/logo_bogt.png',
imageWidth: 200,
imageHeight: 200,
imageAlt: 'Logo Loué terre d\'action',

View file

@ -2,6 +2,7 @@ require('./bootstrap')
require('./pages/poultry-show')
require('./pages/breeder-show')
require('./pages/breeder-poultry-info')
require('./alert');
import IMask from 'imask'

View file

@ -42,4 +42,5 @@
// App
@import './front/variables';
@import './front/pages'
@import './front/pages';
@import './front/alert';

11
resources/sass/front/_alert.scss vendored Normal file
View file

@ -0,0 +1,11 @@
.swal2-confirm {
border-radius: 0 !important;
box-shadow: 0px 5px 5px #00000069 !important;
a {
color: white;
text-transform: uppercase;
text-decoration: none;
font-family: MyriadProBold;
}
}

View file

@ -1,25 +0,0 @@
@import "reset";
@import "fonts";
@import "animate";
@import "media_queries";
$yellow: #f4c600;
$blue: #00245a;
$grey: #696a6c;
$red: #c20012;
$egg: #fccb8d;
$egg_blue: #107ff1;
$footer_bg: #282649;
$elevage: #86ca3f;
$emballage: #1b89c9;
$magasin: #e20613;
body {
background: url("/loue/img/bg.jpg") no-repeat top center fixed;
background-size:cover;
}
@import "index";
@import "sub-page";
@import "alert";