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.

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

🔥 [FEATUREBRANCH] replace md-bootstrap with regular bootstrap #2169

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions package-lock.json

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

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"@popperjs/core": "^2.11",
"@types/luxon": "^3.4.2",
"@vitejs/plugin-vue": "^4.3.3",
"bootstrap": "^5.3",
"jquery": "^3.7.0",
"laravel-vite-plugin": "^1.0.0",
"lodash": "^4.17.21",
Expand All @@ -21,6 +20,7 @@
"@vuepic/vue-datepicker": "^8.4.0",
"apexcharts": "^3.46.0",
"awesomplete": "^1.1.5",
"bootstrap": "^5.3.3",
"bootstrap-cookie-alert": "^1.2.1",
"chart.js": "^2.9.4",
"croppie": "^2.6.5",
Expand All @@ -29,7 +29,6 @@
"Leaflet-MovingMaker": "^0.0.1",
"lgbtq.css": "^2.0.7",
"luxon": "^3.4.4",
"mdb-ui-kit": "^6.4.1",
"notyf": "^3.10.0",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
Expand Down
10 changes: 7 additions & 3 deletions resources/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import "lodash";
import jQuery from "jquery";
import * as Popper from '@popperjs/core';
import { mdb } from "mdb-ui-kit/js/mdb.min";

// initMDB({Input, Dropdown, Popover, Popper, Collapse, Modal, Tooltip});

/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
Expand All @@ -10,14 +12,16 @@ import { mdb } from "mdb-ui-kit/js/mdb.min";
document.addEventListener("DOMContentLoaded", function () {
try {
window.Popper = Popper;
window.$ = window.jQuery = jQuery;
window.$ = window.jQuery = jQuery;

import("bootstrap/js/dist/collapse");
import("bootstrap/js/dist/alert");
import("bootstrap/js/dist/button");
import("bootstrap/js/dist/tab");
import("bootstrap/js/dist/dropdown");
window.mdb = mdb;
import("bootstrap/js/dist/modal");
import("bootstrap/js/dist/popover");
import("bootstrap/js/dist/tooltip");
} catch (e) {
throw new Error(e);
}
Expand Down
2 changes: 1 addition & 1 deletion resources/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@import "variables";

// mdbootstrap
@import "mdb-ui-kit/src/scss/mdb.free.scss";
@import "bootstrap/scss/bootstrap";

.fas.peach::before {
content: "\1f351" !important;
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class="border border-white rounded-left form-control my-0 py-1"
<li class="nav-item dropdown">
<a id="navbarDropdown" href="#" class="nav-link dropdown-toggle mdb-select"
role="button" data-mdb-dropdown-animation="off" data-mdb-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
aria-haspopup="true" aria-expanded="false" data-mdb-dropdown-init>
{{ Auth::user()->name }}
<span class="caret"></span>
</a>
Expand Down
Loading