Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgraded animate.css and included it as CSS not JS #3899

Merged
merged 3 commits into from
Oct 25, 2021
Merged

upgraded animate.css and included it as CSS not JS #3899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c60cc5b
upgraded animate.css and included it as CSS not JS
tabacitu Oct 25, 2021
0ba735a
bumped animate.css to 4.1.1
tabacitu Oct 25, 2021
b963c37
Merge branch '4.2' into upgrade-animate-css
tabacitu Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"/src/public/packages/source-sans-pro/source-sans-pro.css": "/src/public/packages/source-sans-pro/source-sans-pro.css",
"/src/public/packages/source-sans-pro/source-sans-variable.css": "/src/public/packages/source-sans-pro/source-sans-variable.css",
"/src/public/packages/animate.css/animate.min.css": "/src/public/packages/animate.css/animate.min.css",
"/src/public/packages/animate.css/animate.compat.css": "/src/public/packages/animate.css/animate.compat.css",
"/src/public/packages/noty/noty.css": "/src/public/packages/noty/noty.css",
"/src/public/packages/noty/noty.css.map": "/src/public/packages/noty/noty.css.map",
"/src/public/packages/noty/noty.js": "/src/public/packages/noty/noty.js",
Expand Down Expand Up @@ -134,5 +135,6 @@
"/src/public/packages/datatables.net-responsive/package.json": "/src/public/packages/datatables.net-responsive/package.json",
"/src/public/packages/datatables.net-responsive-bs4/License.txt": "/src/public/packages/datatables.net-responsive-bs4/License.txt",
"/src/public/packages/datatables.net-responsive-bs4/Readme.md": "/src/public/packages/datatables.net-responsive-bs4/Readme.md",
"/src/public/packages/datatables.net-responsive-bs4/package.json": "/src/public/packages/datatables.net-responsive-bs4/package.json"
"/src/public/packages/datatables.net-responsive-bs4/package.json": "/src/public/packages/datatables.net-responsive-bs4/package.json",
"/src/public/packages/URI.js/URI.min.js": "/src/public/packages/URI.js/URI.min.js"
}
26 changes: 7 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@coreui/coreui": "^2.1.16",
"@digitallyhappy/backstrap": "^0.3.4",
"animate.css": "^3.7.2",
"animate.css": "^4.1.1",
"bootstrap": "^4.6.0",
"bootstrap-colorpicker": "^3.4.0",
"bootstrap-datepicker": "^1.9.0",
Expand Down
7 changes: 7 additions & 0 deletions src/public/packages/animate.css/animate.compat.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/public/packages/animate.css/animate.min.css
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion src/public/packages/backpack/base/css/bundle.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/packages/backpack/base/js/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/resources/assets/js/bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ require('bootstrap'); // Bootstrap for tabs, dropdowns, carousels etc
require('@coreui/coreui'); // CoreUI for sidemenu
require('pace-js'); // Pace JS for a slim progress bar at the top of the screen during AJAX calls

import swal from 'sweetalert';
import swal from 'sweetalert';
4 changes: 2 additions & 2 deletions src/resources/assets/scss/bundle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
@import "node_modules/@digitallyhappy/backstrap/src/scss/_custom";
// @import "node_modules/line-awesome/css/line-awesome";
// @import "node_modules/source-sans-pro/source-sans-pro";
@import "~animate.css/animate.min.css";
@import "node_modules/noty/src/noty";
@import "~animate.css/animate.compat.css";
@import "node_modules/noty/src/noty";
1 change: 1 addition & 0 deletions webpack.mix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ mix.copy('node_modules/@digitallyhappy/backstrap/dist/css', 'src/public/packages
mix.copy('node_modules/line-awesome/dist/line-awesome', 'src/public/packages/line-awesome')
.copy('node_modules/source-sans-pro', 'src/public/packages/source-sans-pro')
.copy('node_modules/animate.css/animate.min.css', 'src/public/packages/animate.css/animate.min.css')
.copy('node_modules/animate.css/animate.compat.css', 'src/public/packages/animate.css/animate.compat.css')
.copy('node_modules/noty/lib', 'src/public/packages/noty');


Expand Down