From cffff1635dd930ec68fbfb7a2faa4f6286cb8904 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 4 Dec 2019 13:20:45 +0100 Subject: [PATCH] Rename bootstrap-tooltips file This avoids clashing with including upstream bootstrap --- .../stylesheets/{bootstrap.css => bootstrap-tooltips.css} | 0 app/assets/stylesheets/screen-ltr.css | 2 +- app/assets/stylesheets/screen-rtl.css | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename app/assets/stylesheets/{bootstrap.css => bootstrap-tooltips.css} (100%) 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 */ -- 2.39.5