Upgraded to bootswatch 4.5.3

symfony · Apr 4, 2023 · 9758c24 · 9758c24
1 parent 821812d
commit 9758c24
Show file tree

Hide file tree

Showing 22 changed files with 319 additions and 162 deletions.
diff --git a/assets/admin.js b/assets/admin.js
@@ -1,25 +1,24 @@
 import './styles/admin.scss';
-import 'eonasdan-bootstrap-datetimepicker';
 import 'typeahead.js';
 import Bloodhound from "bloodhound-js";
 import 'bootstrap-tagsinput';
 
 $(function() {
     // Datetime picker initialization.
     // See https://eonasdan.github.io/bootstrap-datetimepicker/
-    $('[data-toggle="datetimepicker"]').datetimepicker({
-        icons: {
-            time: 'fa fa-clock-o',
-            date: 'fa fa-calendar',
-            up: 'fa fa-chevron-up',
-            down: 'fa fa-chevron-down',
-            previous: 'fa fa-chevron-left',
-            next: 'fa fa-chevron-right',
-            today: 'fa fa-check-circle-o',
-            clear: 'fa fa-trash',
-            close: 'fa fa-remove'
-        }
-    });
+    // $('[data-toggle="datetimepicker"]').datetimepicker({
+    //     icons: {
+    //         time: 'fa fa-clock-o',
+    //         date: 'fa fa-calendar',
+    //         up: 'fa fa-chevron-up',
+    //         down: 'fa fa-chevron-down',
+    //         previous: 'fa fa-chevron-left',
+    //         next: 'fa fa-chevron-right',
+    //         today: 'fa fa-check-circle-o',
+    //         clear: 'fa fa-trash',
+    //         close: 'fa fa-remove'
+    //     }
+    // });
 
     // Bootstrap-tagsinput initialization
     // https://bootstrap-tagsinput.github.io/bootstrap-tagsinput/examples/
@@ -57,7 +56,7 @@ $(document).on('submit', 'form[data-confirmation]', function (event) {
             .on('click', '#btnYes', function () {
                 $confirm.data('result', 'yes');
                 $form.find('input[type="submit"]').attr('disabled', 'disabled');
-                $form.submit();
+                $form.trigger('submit');
             })
             .modal('show');
     }

diff --git a/assets/app.js b/assets/app.js
@@ -1,11 +1,12 @@
 import './styles/app.scss';
 
 // loads the Bootstrap jQuery plugins
-import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
-import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
-import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
-import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
-import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
+// import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
+import 'bootstrap/js/dist/alert';
+import 'bootstrap/js/dist/alert';
+import 'bootstrap/js/dist/collapse';
+import 'bootstrap/js/dist/dropdown';
+import 'bootstrap/js/dist/modal';
 import 'jquery'
 
 // loads the code syntax highlighting library

diff --git a/assets/styles/admin.scss b/assets/styles/admin.scss
@@ -1,5 +1,5 @@
-@import "~bootswatch/flatly/variables";
-@import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
+@import "variables";
+// @import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
 @import "bootstrap-tagsinput.scss";
 
 /* Page: 'Backend post index'
@@ -24,3 +24,12 @@ body#admin_post_show .post-tags .label-default {
 body#admin_post_show .post-tags .label-default i {
   color: #95A6A7;
 }
+
+.form-control {
+  border-width: .125rem;
+
+  &:focus {
+    color: $blue;
+    box-shadow: none;
+  }
+}