From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 4 Dec 2019 12:20:45 +0000 (+0100)
Subject: Rename bootstrap-tooltips file
X-Git-Tag: live~3292^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/cffff1635dd930ec68fbfb7a2faa4f6286cb8904

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 d074f6881..ff93bc5a5 100644
--- 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 18d3d7c5a..d5cd9f10d 100644
--- 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
  */