From c6a4f35202ab5a2b36fb65b3cf1e422fefade31f Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Fri, 8 Jul 2022 12:45:58 +0200 Subject: [PATCH] update from master --- package-lock.json | 17 ++++++++++++ package.json | 3 +++ .../loue/img => assets/images}/logo_bogt.png | Bin resources/js/alert.js | 2 +- resources/js/front.js | 1 + resources/sass/front.scss | 3 ++- resources/sass/front/_alert.scss | 11 ++++++++ resources/themes/loue/css/app.scss | 25 ------------------ 8 files changed, 35 insertions(+), 27 deletions(-) rename resources/{themes/loue/img => assets/images}/logo_bogt.png (100%) create mode 100644 resources/sass/front/_alert.scss delete mode 100644 resources/themes/loue/css/app.scss diff --git a/package-lock.json b/package-lock.json index d6b2e84..b61169f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index b15b485..7eb8855 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,8 @@ "sass-loader": "^8.0.2", "vue": "^2.6.14", "vue-template-compiler": "^2.6.14" + }, + "dependencies": { + "sweetalert2": "^11.4.20" } } diff --git a/resources/themes/loue/img/logo_bogt.png b/resources/assets/images/logo_bogt.png similarity index 100% rename from resources/themes/loue/img/logo_bogt.png rename to resources/assets/images/logo_bogt.png diff --git a/resources/js/alert.js b/resources/js/alert.js index 1251ac8..1e13dea 100644 --- a/resources/js/alert.js +++ b/resources/js/alert.js @@ -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', diff --git a/resources/js/front.js b/resources/js/front.js index 241ae79..1e70a3a 100644 --- a/resources/js/front.js +++ b/resources/js/front.js @@ -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' diff --git a/resources/sass/front.scss b/resources/sass/front.scss index 8610b99..66a3ce8 100644 --- a/resources/sass/front.scss +++ b/resources/sass/front.scss @@ -42,4 +42,5 @@ // App @import './front/variables'; -@import './front/pages' +@import './front/pages'; +@import './front/alert'; \ No newline at end of file diff --git a/resources/sass/front/_alert.scss b/resources/sass/front/_alert.scss new file mode 100644 index 0000000..663b01b --- /dev/null +++ b/resources/sass/front/_alert.scss @@ -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; + } +} \ No newline at end of file diff --git a/resources/themes/loue/css/app.scss b/resources/themes/loue/css/app.scss deleted file mode 100644 index f8a865a..0000000 --- a/resources/themes/loue/css/app.scss +++ /dev/null @@ -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";