diff --git a/assets/src/js/main.js b/assets/src/js/main.js index bf77e34..f3c338f 100644 --- a/assets/src/js/main.js +++ b/assets/src/js/main.js @@ -1,21 +1,21 @@ // Импортируем jQuery -//= ../bower_components/jquery/dist/jquery.js +//= ../../../node_modules/jquery/dist/jquery.js // Импортируем Popper -//= ../bower_components/popper.js/dist/umd/popper.js +//= ../../../node_modules/popper.js/dist/umd/popper.js // Импортируем необходимые js-файлы Bootstrap 4 -//= ../bower_components/bootstrap/js/dist/util.js -//= ../bower_components/bootstrap/js/dist/alert.js -//= ../bower_components/bootstrap/js/dist/button.js -//= ../bower_components/bootstrap/js/dist/carousel.js -//= ../bower_components/bootstrap/js/dist/collapse.js -//= ../bower_components/bootstrap/js/dist/dropdown.js -//= ../bower_components/bootstrap/js/dist/modal.js -//= ../bower_components/bootstrap/js/dist/scrollspy.js -//= ../bower_components/bootstrap/js/dist/tab.js -//= ../bower_components/bootstrap/js/dist/tooltip.js -//= ../bower_components/bootstrap/js/dist/popover.js +//= ../../../node_modules/bootstrap/js/dist/util.js +//= ../../../node_modules/bootstrap/js/dist/alert.js +//= ../../../node_modules/bootstrap/js/dist/button.js +//= ../../../node_modules/bootstrap/js/dist/carousel.js +//= ../../../node_modules/bootstrap/js/dist/collapse.js +//= ../../../node_modules/bootstrap/js/dist/dropdown.js +//= ../../../node_modules/bootstrap/js/dist/modal.js +//= ../../../node_modules/bootstrap/js/dist/scrollspy.js +//= ../../../node_modules/bootstrap/js/dist/tab.js +//= ../../../node_modules/bootstrap/js/dist/tooltip.js +//= ../../../node_modules/bootstrap/js/dist/popover.js // Импортируем другие js-файлы //= my.js \ No newline at end of file diff --git a/assets/src/style/main.scss b/assets/src/style/main.scss index 6283d91..6bc3e78 100644 --- a/assets/src/style/main.scss +++ b/assets/src/style/main.scss @@ -2,40 +2,40 @@ @import "variables"; // Подключение нужных SCSS исходников Bootstrap 4 -@import "../bower_components/bootstrap/scss/functions"; -@import "../bower_components/bootstrap/scss/variables"; -@import "../bower_components/bootstrap/scss/mixins"; -@import "../bower_components/bootstrap/scss/print"; -@import "../bower_components/bootstrap/scss/reboot"; -@import "../bower_components/bootstrap/scss/type"; -@import "../bower_components/bootstrap/scss/images"; -@import "../bower_components/bootstrap/scss/code"; -@import "../bower_components/bootstrap/scss/grid"; -@import "../bower_components/bootstrap/scss/tables"; -@import "../bower_components/bootstrap/scss/forms"; -@import "../bower_components/bootstrap/scss/buttons"; -@import "../bower_components/bootstrap/scss/transitions"; -@import "../bower_components/bootstrap/scss/dropdown"; -@import "../bower_components/bootstrap/scss/button-group"; -@import "../bower_components/bootstrap/scss/input-group"; -@import "../bower_components/bootstrap/scss/custom-forms"; -@import "../bower_components/bootstrap/scss/nav"; -@import "../bower_components/bootstrap/scss/navbar"; -@import "../bower_components/bootstrap/scss/card"; -@import "../bower_components/bootstrap/scss/breadcrumb"; -@import "../bower_components/bootstrap/scss/pagination"; -@import "../bower_components/bootstrap/scss/badge"; -@import "../bower_components/bootstrap/scss/jumbotron"; -@import "../bower_components/bootstrap/scss/alert"; -@import "../bower_components/bootstrap/scss/progress"; -@import "../bower_components/bootstrap/scss/media"; -@import "../bower_components/bootstrap/scss/list-group"; -@import "../bower_components/bootstrap/scss/close"; -@import "../bower_components/bootstrap/scss/modal"; -@import "../bower_components/bootstrap/scss/tooltip"; -@import "../bower_components/bootstrap/scss/popover"; -@import "../bower_components/bootstrap/scss/carousel"; -@import "../bower_components/bootstrap/scss/utilities"; +@import "../../../node_modules/bootstrap/scss/_functions"; +@import "../../../node_modules/bootstrap/scss/_variables"; +@import "../../../node_modules/bootstrap/scss/_mixins"; +@import "../../../node_modules/bootstrap/scss/_print"; +@import "../../../node_modules/bootstrap/scss/_reboot"; +@import "../../../node_modules/bootstrap/scss/_type"; +@import "../../../node_modules/bootstrap/scss/_images"; +@import "../../../node_modules/bootstrap/scss/_code"; +@import "../../../node_modules/bootstrap/scss/_grid"; +@import "../../../node_modules/bootstrap/scss/_tables"; +@import "../../../node_modules/bootstrap/scss/_forms"; +@import "../../../node_modules/bootstrap/scss/_buttons"; +@import "../../../node_modules/bootstrap/scss/_transitions"; +@import "../../../node_modules/bootstrap/scss/_dropdown"; +@import "../../../node_modules/bootstrap/scss/_button-group"; +@import "../../../node_modules/bootstrap/scss/_input-group"; +@import "../../../node_modules/bootstrap/scss/_custom-forms"; +@import "../../../node_modules/bootstrap/scss/_nav"; +@import "../../../node_modules/bootstrap/scss/_navbar"; +@import "../../../node_modules/bootstrap/scss/_card"; +@import "../../../node_modules/bootstrap/scss/_breadcrumb"; +@import "../../../node_modules/bootstrap/scss/_pagination"; +@import "../../../node_modules/bootstrap/scss/_badge"; +@import "../../../node_modules/bootstrap/scss/_jumbotron"; +@import "../../../node_modules/bootstrap/scss/_alert"; +@import "../../../node_modules/bootstrap/scss/_progress"; +@import "../../../node_modules/bootstrap/scss/_media"; +@import "../../../node_modules/bootstrap/scss/_list-group"; +@import "../../../node_modules/bootstrap/scss/_close"; +@import "../../../node_modules/bootstrap/scss/_modal"; +@import "../../../node_modules/bootstrap/scss/_tooltip"; +@import "../../../node_modules/bootstrap/scss/_popover"; +@import "../../../node_modules/bootstrap/scss/_carousel"; +@import "../../../node_modules/bootstrap/scss/_utilities"; // Подключение своих SCSS файлов @import "my"; \ No newline at end of file