Rename bootstrap-tooltips file

This avoids clashing with including upstream bootstrap

diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap-tooltips.css
similarity index 100%
rename from app/assets/stylesheets/bootstrap.css
rename to app/assets/stylesheets/bootstrap-tooltips.css

diff --git a/app/assets/stylesheets/screen-ltr.css b/app/assets/stylesheets/screen-ltr.css
index d074f68815b458fdced15e634aa99df68cbcd730..ff93bc5a51bb52b39ae828dc97f20668a74fd7f0 100644 (file)
--- a/app/assets/stylesheets/screen-ltr.css
+++ b/app/assets/stylesheets/screen-ltr.css
@@ -1,5 +1,5 @@
 /*
  *= require ltr/common
- *= require bootstrap
+ *= require bootstrap-tooltips
  *= require ltr/small
  */

diff --git a/app/assets/stylesheets/screen-rtl.css b/app/assets/stylesheets/screen-rtl.css
index 18d3d7c5a568c8c2d657865c703ccec36e377545..d5cd9f10d9c9013c092abfc1bd132b230870d21f 100644 (file)
--- a/app/assets/stylesheets/screen-rtl.css
+++ b/app/assets/stylesheets/screen-rtl.css
@@ -1,5 +1,5 @@
 /*
  *= require rtl/common
- *= require bootstrap
+ *= require bootstrap-tooltips
  *= require rtl/small
  */