update deps js (Hexlet#717)

eKulshan · Jan 24, 2024 · 945918a · 945918a
1 parent 2ad3ace
commit 945918a
Show file tree

Hide file tree

Showing 4 changed files with 4,998 additions and 14,577 deletions.
diff --git a/app/javascript/stylesheets/application.scss b/app/javascript/stylesheets/application.scss
@@ -3,9 +3,12 @@ $link-decoration: none;
 
 @import 'bootstrap/scss/bootstrap';
 @import 'select2';
-@import 'select2-bootstrap-5-theme';
+// @import 'select2-bootstrap-5-theme';
 @import 'bootstrap-icons/font/bootstrap-icons';
 @import "swiper/css/bundle";
+// хак чтобы select2-bootstrap  не конфликтовал с новым bootstrap
+$s2bs5-border-color: $border-color;
+@import "select2-bootstrap-5-theme/src/include-all";
 
 
 

diff --git a/app/views/web/admin/career_member_users/_careers.html.slim b/app/views/web/admin/career_member_users/_careers.html.slim
@@ -2,4 +2,4 @@
   .d-flex.fw-bold.flex-wrap
     - careers.each do |career|
       .m-1
-        = filter_link(career.name, { careers_slug_in: career.slug }, class: 'badge bg-success text-body-tertiary')
+        = filter_link(career.name, { careers_slug_in: career.slug }, class: 'badge bg-success')