From 9415128fcb94a7c5daeb2aa323428de593dc94a5 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:03:05 -0700 Subject: [PATCH 01/11] Switch todo glyphs to FontAwesome --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index caa1e560..8047d250 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -60,9 +60,9 @@ module ApplicationHelper def icon_for_todo(bool) if bool - return 'glyphicon glyphicon-ok' + return 'fa fa-check' else - return 'glyphicon glyphicon-remove' + return 'fa fa-times' end end From df35b8bc467301896b078a7ac91c2b1aaf234bfc Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:08:07 -0700 Subject: [PATCH 02/11] Switch admin list glyphs to FontAwesome... ... match with dashbox icons. --- app/views/admin/conference/index.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/conference/index.html.haml b/app/views/admin/conference/index.html.haml index 11958df7..71c2c916 100644 --- a/app/views/admin/conference/index.html.haml +++ b/app/views/admin/conference/index.html.haml @@ -65,15 +65,15 @@ %ul.nav.nav-tabs#recentTable %li.active %a{:href=>"#recent_user", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-user + %span.fa.fa-user Recent Users %li %a{:href=>"#recent_reg", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-star + %span.fa.fa-check-square Recent Registrations %li %a{:href=>"#recent_submissions", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-comment + %span.fa.fa-file-text Recent Submissions .tab-content .tab-pane.active#recent_user From 2067ad726ee807f43b9484ddbc792edc7d89e0fd Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:15:13 -0700 Subject: [PATCH 03/11] Switch admin conference glyphs to FontAwesome --- app/views/admin/conference/show.html.haml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/admin/conference/show.html.haml b/app/views/admin/conference/show.html.haml index f450023e..de745de6 100644 --- a/app/views/admin/conference/show.html.haml +++ b/app/views/admin/conference/show.html.haml @@ -1,12 +1,12 @@ %h1 - %span.glyphicon.glyphicon-dashboard + %span.fa.fa-tachometer Dashboard for #{@conference.title} %hr .row .col-sm-4 .dashbox.text-center .icon - %i.glyphicon.glyphicon-star + %i.fa.fa-user.fa-lg .text %label.text-muted total registrations: #{@total_reg} %label.text-muted new registrations: #{@new_reg} @@ -15,7 +15,7 @@ .col-sm-4 .dashbox.text-center .icon - %i.glyphicon.glyphicon-comment + %i.fa.fa-check-square.fa-lg .text %label.text-muted total submissions: #{@total_submissions} %label.text-muted new submissions: #{@new_submissions} @@ -24,7 +24,7 @@ .col-sm-4 .dashbox.text-center .icon - %i.glyphicon.glyphicon-user + %i.fa.fa-file-text.fa-lg .text %label.text-muted program: #{@program_length} min %label.text-muted new program: #{@new_program_length} min @@ -61,11 +61,11 @@ %ul.nav.nav-tabs#doughnut_tabs %li.active %a{:href=>"#distribution_all", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-star + %span.fa.fa-star All %li %a{:href=>"#distribution_confirmed", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-comment + %span.fa.fa-comment Confirmed .tab-content .tab-pane.active#distribution_all @@ -90,11 +90,11 @@ %ul.nav.nav-tabs#recentTable %li.active %a{:href=>"#recent_reg", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-star + %span.fa.fa-user Recent Registrations %li %a{:href=>"#recent_submissions", "data-toggle"=>"tab"} - %span.glyphicon.glyphicon-comment + %span.fa.fa-file-text Recent Submissions .tab-content .tab-pane.active#recent_reg @@ -107,7 +107,7 @@ .col-md-12 %h3 %span - %i.glyphicon.glyphicon-flag + %i.fa.fa-flag Campaigns = render partial: 'campaigns', locals: {campaigns: @campaigns, name: 'campaigns'} From 90bc1b051361434ee89d10133a2f11a5549abefc Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:19:56 -0700 Subject: [PATCH 04/11] Reformat dashboxes like admin/index --- app/views/admin/conference/show.html.haml | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/views/admin/conference/show.html.haml b/app/views/admin/conference/show.html.haml index de745de6..f07e9d2a 100644 --- a/app/views/admin/conference/show.html.haml +++ b/app/views/admin/conference/show.html.haml @@ -3,33 +3,33 @@ Dashboard for #{@conference.title} %hr .row - .col-sm-4 + .col-sm-4.col-xs-4 .dashbox.text-center - .icon - %i.fa.fa-user.fa-lg - .text - %label.text-muted total registrations: #{@total_reg} - %label.text-muted new registrations: #{@new_reg} - .row - = render partial: 'targets', locals: { targets: @registration_targets, name: 'registrations' } - .col-sm-4 + %span.fa.fa-user.fa-lg + %span.fa.fa-lg + = @total_user + %p + %small + #{'Registration'.pluralize(@registration_targets)} + + .col-sm-4.col-xs-4 .dashbox.text-center - .icon - %i.fa.fa-check-square.fa-lg - .text - %label.text-muted total submissions: #{@total_submissions} - %label.text-muted new submissions: #{@new_submissions} - .row - = render partial: 'targets', locals: { targets: @submission_targets, name: 'submissions' } - .col-sm-4 + %span.fa.fa-check-square.fa-lg + %span.fa.fa-lg + = @total_reg + %p + %small + #{'Submission'.pluralize(@submission_targets)} + + .col-sm-4.col-xs-4 .dashbox.text-center - .icon - %i.fa.fa-file-text.fa-lg - .text - %label.text-muted program: #{@program_length} min - %label.text-muted new program: #{@new_program_length} min - .row - = render partial: 'targets', locals: { targets: @program_minutes_targets, name: 'program_hours' } + %span.fa.fa-file-text.fa-lg + %span.fa.fa-lg + = @total_submissions + %p + %small + #{'Hour'.pluralize(@program_minutes_targets)} + .row .col-md-12 .row From ebe97800596a215c1122bb949023120808196791 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:22:20 -0700 Subject: [PATCH 05/11] Switch Splash gallery glyphs to FontAwesome --- app/views/conference/_gallery.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/conference/_gallery.html.haml b/app/views/conference/_gallery.html.haml index 0398cf45..22bd3616 100644 --- a/app/views/conference/_gallery.html.haml +++ b/app/views/conference/_gallery.html.haml @@ -9,9 +9,9 @@ %a{ class: "left carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "prev" } - %span{ class: "glyphicon glyphicon-chevron-left" } + %span.fa.fa-chevron-left %a{ class: "right carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "next" } - %span{ class: "glyphicon glyphicon-chevron-right" } + %span.fa.fa-chevron-right :javascript From ba1aed3c544adfbbaecdc203c3bc1a1b9f394cfb Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:28:14 -0700 Subject: [PATCH 06/11] Switch admin navigation glyphs to FontAwesome --- app/assets/javascripts/osem.js | 4 +-- app/views/layouts/_admin_sidebar.html.haml | 36 +++++++++---------- .../layouts/_admin_sidebar_index.html.haml | 10 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js index 1afb2c3a..82a72a77 100644 --- a/app/assets/javascripts/osem.js +++ b/app/assets/javascripts/osem.js @@ -104,11 +104,11 @@ $(function () { //Hide all except this $siblings = $(this).siblings().find("ul:visible"); $siblings.hide(); - $siblings.parent().find('span:nth-child(2)').toggleClass("glyphicon-chevron-down glyphicon-chevron-right"); + $siblings.parent().find('span:nth-child(2)').toggleClass("fa-chevron-down fa-chevron-right"); //show this $(this).find("ul").show(); - $(this).find('span:nth-child(2)').toggleClass("glyphicon-chevron-down glyphicon-chevron-right"); + $(this).find('span:nth-child(2)').toggleClass("fa-chevron-down fa-chevron-right"); } }); diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index fee18ecc..d37d35c0 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -1,25 +1,25 @@ %ul.nav.nav-stacked.nav-pills.mySidebar .btn-group %button{type:'button', class:'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} - %span.glyphicon.glyphicon-cog + %span.fa.fa-cog = @conference.short_title %span.caret %ul.dropdown-menu{role:'menu'} %li = link_to(admin_conference_index_path) do - %span.glyphicon.glyphicon-home + %span.fa.fa-home All Conferences - @conferences.each do |conference| - if can? :show, conference %li = link_to(admin_conference_path(conference.short_title)) do - %span.glyphicon.glyphicon-cog + %span.fa.fa-cog Manage = conference.short_title - if (current_user.is_admin) || (current_user.has_role? :organizer, :any) %li = link_to(new_admin_conference_path) do - %span.glyphicon.glyphicon-plus + %span.fa.fa-plus New Conference %hr - if can? :show, @conference @@ -56,35 +56,35 @@ - if can? :update, @conference.events.build %li{:class=> active_nav_li(admin_conference_events_path(@conference.short_title))} = link_to(admin_conference_events_path(@conference.short_title)) do - %span.glyphicon.glyphicon-comment + %span.fa.fa-comment Events - if can? :update, Registration.new(conference_id: @conference.id) %li{:class=> active_nav_li(admin_conference_registrations_path(@conference.short_title))} = link_to(admin_conference_registrations_path(@conference.short_title)) do - %span.glyphicon.glyphicon-user + %span.fa.fa-user Registrations - if can? :update, @conference.events.build %li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))} = link_to(admin_conference_schedule_path(@conference.short_title), target: '_blank') do - %span.glyphicon.glyphicon-calendar + %span.fa.fa-calendar Schedule - if can? :update, @conference %li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))} = link_to(admin_conference_campaigns_path(@conference.short_title)) do - %span.glyphicon.glyphicon-bullhorn + %span.fa.fa-bullhorn Campaigns %hr - if can? :update, @conference.targets.build %li{:class=> "#{active_nav_li(admin_conference_targets_path(@conference.short_title))}"} = link_to(admin_conference_targets_path(@conference.short_title)) do - %span.glyphicon.glyphicon-flag + %span.fa.fa-flag Targets - if can? :index, @conference.venue %li{:class=> "#{active_nav_li(admin_conference_venue_info_path(@conference.short_title))} myAccordion"} = link_to(admin_conference_venue_info_path(@conference.short_title)) do - %span.glyphicon.glyphicon-road + %span.fa.fa-road Venue - %span.small.glyphicon.glyphicon-chevron-right + %span.small.fa.fa-chevron-right %ul.nav.nav-stacked.nav-pills.small.collapse.subNav - if can? :update, @conference.rooms.build %li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))} @@ -95,9 +95,9 @@ - if can? :update, @conference.sponsorship_levels.build %li{:class=> "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))} myAccordion" } = link_to(admin_conference_sponsorship_levels_path(@conference.short_title)) do - %span.glyphicon.glyphicon-star + %span.fa.fa-star Sponsorship - %span.small.glyphicon.glyphicon-chevron-right + %span.small.fa.fa-chevron-right %ul.nav.nav-stacked.nav-pills.small.collapse.subNav - if can? :update, @conference.sponsors.build %li{:class=> active_nav_li(admin_conference_sponsors_path(@conference.short_title))} @@ -105,19 +105,19 @@ - if can? :update, @conference.supporter_levels.build %li{ class: active_nav_li(admin_conference_supporter_levels_path(@conference.short_title)) } = link_to(admin_conference_supporter_levels_path(@conference.short_title)) do - %span.glyphicon.glyphicon-usd + %span.fa.fa-usd Supporter Levels - if can? :update, @conference.email_settings %li{:class=> active_nav_li(admin_conference_emails_path(@conference.short_title))} = link_to(admin_conference_emails_path(@conference.short_title)) do - %span.glyphicon.glyphicon-envelope + %span.fa.fa-envelope E-Mails - if can? :update, CallForPapers.new(conference_id: @conference.id) %li{:class=> "#{active_nav_li(admin_conference_callforpapers_path(@conference.short_title))} myAccordion"} = link_to(admin_conference_callforpapers_path(@conference.short_title)) do - %span.glyphicon.glyphicon-comment + %span.fa.fa-comment Call for papers - %span.small.glyphicon.glyphicon-chevron-right + %span.small.fa.fa-chevron-right %ul.nav.nav-stacked.nav-pills.small.collapse.subNav - if can? :update, @conference.tracks.build %li{:class=> active_nav_li(admin_conference_tracks_path(@conference.short_title))} @@ -131,7 +131,7 @@ - if can? :update, Question.new(conference_id: @conference.id) %li{:class=> active_nav_li(admin_conference_questions_path(@conference.short_title))} = link_to(admin_conference_questions_path(@conference.short_title)) do - %span.glyphicon.glyphicon-question-sign + %span.fa.fa-question Questions - if can? :manage, @conference %li{:class=> active_nav_li(roles_admin_conference_path(@conference.short_title))} diff --git a/app/views/layouts/_admin_sidebar_index.html.haml b/app/views/layouts/_admin_sidebar_index.html.haml index 219d0a56..352ff877 100644 --- a/app/views/layouts/_admin_sidebar_index.html.haml +++ b/app/views/layouts/_admin_sidebar_index.html.haml @@ -1,29 +1,29 @@ %ul.nav.nav-pills.nav-stacked.mySidebar .btn-group %button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} - %span.glyphicon.glyphicon-home + %span.fa.fa-home All Conferences %span.caret %ul.dropdown-menu{role: 'menu'} %li = link_to(admin_conference_index_path) do - %span.glyphicon.glyphicon-home + %span.fa.fa-home All Conferences - @conferences.each do |conference| - if can? :show, conference %li = link_to(admin_conference_path(conference.short_title)) do - %span.glyphicon.glyphicon-cog + %span.fa.fa-cog Manage = conference.short_title - if (current_user.is_admin) || (current_user.has_role? :organizer, :any) %li = link_to(new_admin_conference_path) do - %span.glyphicon.glyphicon-plus + %span.fa.fa-plus New Conference - if can? :index, User %hr %li = link_to(admin_users_path) do - %span.glyphicon.glyphicon-user + %span.fa.fa-user Users From d50ac96c6bf6bb55d2fe0e124b5042bb2cb020bb Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:30:21 -0700 Subject: [PATCH 07/11] Switch header navigation glyphs to FontAwesome --- app/views/layouts/_navigation.html.haml | 6 +++--- app/views/layouts/_user_menu.html.haml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 02b7f679..cf4d1fde 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -29,16 +29,16 @@ - if current_page?(new_registration_path('user')) %li.active = link_to(new_registration_path('user')) do - %span.glyphicon.glyphicon-heart + %span.fa.fa-heart Sign Up - else %li = link_to(new_registration_path('user')) do - %span.glyphicon.glyphicon-heart + %span.fa.fa-heart Sign Up %li.dropdown.visible-desktop %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"} - %span.glyphicon.glyphicon-user + %span.fa.fa-user Sign In %span.caret .dropdown-menu{:style => "padding: 17px;"} diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml index 8e4f4ac4..882d7efe 100644 --- a/app/views/layouts/_user_menu.html.haml +++ b/app/views/layouts/_user_menu.html.haml @@ -1,29 +1,29 @@ %li = link_to(edit_user_registration_path) do - %span.glyphicon.glyphicon-wrench + %span.fa.fa-wrench Edit Account -if @conference and @conference.id %li = link_to(conference_proposal_index_path(@conference.short_title)) do - %span.glyphicon.glyphicon-comment + %span.fa.fa-comment My Submissions %li = link_to(destroy_user_session_path, :method=>'delete') do - %span.glyphicon.glyphicon-minus + %span.fa.fa-minus Sign out - if can? :index, Conference %li.divider %li = link_to(admin_conference_index_path()) do - if Conference.any? - %span.glyphicon.glyphicon-home + %span.fa.fa-home Administration - else - %span.glyphicon.glyphicon-plus + %span.fa.fa-plus Create Conference -if @conference and @conference.id and can? :show, @conference %li = link_to(admin_conference_path(@conference.short_title)) do - %span.glyphicon.glyphicon-cog + %span.fa.fa-cog Manage = @conference.short_title From eac40ddfd1eb214e107a2d678d5f24bc4519509d Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:41:12 -0700 Subject: [PATCH 08/11] Switch proposal attachment glyphs to FontAwesome --- app/views/proposal/_form.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/proposal/_form.html.haml b/app/views/proposal/_form.html.haml index 0b78cbdb..83e67ae1 100644 --- a/app/views/proposal/_form.html.haml +++ b/app/views/proposal/_form.html.haml @@ -55,7 +55,7 @@ .row-fluid.fileupload-buttonbar .btn.btn-success.fileinput-button - %span.glyphicon.glyphicon-icon-plus.icon-white + %span.fa.fa-plus Add files... = f.file_field :attachment = f.hidden_field :event_id, :value => @event.id @@ -100,7 +100,7 @@ {% } else if (o.files.valid && !i) { %} {% if (!o.options.autoUpload) { %} {% } %} @@ -109,7 +109,7 @@ {% } %} {% if (!i) { %} {% } %} @@ -138,7 +138,7 @@ {% } %} From e79ed97a942b2f4b344c823ea4fcc348564d81e0 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:42:14 -0700 Subject: [PATCH 09/11] Switch schedule glyphs to FontAwesome --- app/views/schedule/index.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/schedule/index.html.erb b/app/views/schedule/index.html.erb index 98aea947..e16bd88a 100644 --- a/app/views/schedule/index.html.erb +++ b/app/views/schedule/index.html.erb @@ -54,7 +54,7 @@ :style => "padding:8px;" %> <%- end %>
- + <%= event[0].title %> <% unless event[0].subtitle.blank? %> @@ -64,12 +64,12 @@
- + <%= "#{speaker.name}" %> <% if event[0].track%> - + <%= event[0].track.name %> <% end -%> @@ -94,18 +94,18 @@ <%= javascript_tag do %> - jQuery( function($) { - $('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) { + jQuery( function($) { + $('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) { if(e.which===1) { - window.location = $(this).attr('data-href'); + window.location = $(this).attr('data-href'); } else if(e.which===2) { window.open($(this).attr('data-href'), '_blank'); } - }); -}); + }); +}); $(function() { // add a hash to the URL when the user clicks on a tab From e9019ed4fc0cfa365430f4c04d552d3ffb6598b8 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:46:19 -0700 Subject: [PATCH 10/11] Update global glyph style --- app/assets/stylesheets/osem.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.css.scss index 46e5d747..f59b73b1 100644 --- a/app/assets/stylesheets/osem.css.scss +++ b/app/assets/stylesheets/osem.css.scss @@ -33,7 +33,7 @@ body { text-transform: uppercase; } -.glyphicon { +.fa { margin-right: 10px; } From 42a914398bddae4d64f7be8b5a935c9f15df1048 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Aug 2014 18:54:14 -0700 Subject: [PATCH 11/11] Specifying bootstrap components explicitly, excluding glyphicons. --- app/assets/stylesheets/strap-on.css.scss | 55 +++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/strap-on.css.scss b/app/assets/stylesheets/strap-on.css.scss index 68e36e62..20448614 100644 --- a/app/assets/stylesheets/strap-on.css.scss +++ b/app/assets/stylesheets/strap-on.css.scss @@ -5,5 +5,58 @@ $navbar-default-color: #ffffff; $navbar-default-link-color: #ffffff; $navbar-default-link-hover-color: #000000; -@import 'bootstrap'; @import 'bootstrap-datetimepicker'; + +// +// Bootstrap components +// +// Core variables and mixins +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +// Reset and dependencies +@import "bootstrap/normalize"; +@import "bootstrap/print"; +// @import "bootstrap/glyphicons"; // Using FontAwesome instead + +// Core CSS +@import "bootstrap/scaffolding"; +@import "bootstrap/type"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; + +// Components +@import "bootstrap/component-animations"; +@import "bootstrap/dropdowns"; +@import "bootstrap/button-groups"; +@import "bootstrap/input-groups"; +@import "bootstrap/navs"; +@import "bootstrap/navbar"; +@import "bootstrap/breadcrumbs"; +@import "bootstrap/pagination"; +@import "bootstrap/pager"; +@import "bootstrap/labels"; +@import "bootstrap/badges"; +@import "bootstrap/jumbotron"; +@import "bootstrap/thumbnails"; +@import "bootstrap/alerts"; +@import "bootstrap/progress-bars"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/panels"; +@import "bootstrap/responsive-embed"; +@import "bootstrap/wells"; +@import "bootstrap/close"; + +// Components w/ JavaScript +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; +@import "bootstrap/carousel"; + +// Utility classes +@import "bootstrap/utilities"; +@import "bootstrap/responsive-utilities";