From 1ea9ef79924662ad7b2df8dffad8d025e22caa51 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Mon, 6 Aug 2018 10:17:44 +0200
Subject: [REF] web_editor: rename scss file to respect convention

The file was introduced with BS4 but the name was not well chosen.
---
 .../static/src/scss/bootstrap_overridden.scss         | 19 +++++++++++++++++++
 .../static/src/scss/web_editor.common.bootstrap.scss  | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 addons/web_editor/static/src/scss/bootstrap_overridden.scss
 delete mode 100644 addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss

(limited to 'addons/web_editor/static/src')

diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
new file mode 100644
index 00000000000..edd79516154
--- /dev/null
+++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
@@ -0,0 +1,19 @@
+
+// Automatically extend bootstrap to create theme background/text/button classes
+$theme-colors: () !default;
+$theme-colors: map-merge((
+    'alpha': $color-alpha,
+    'beta': $color-beta,
+    'gamma': $color-gamma,
+    'delta': $color-delta,
+    'epsilon': $color-epsilon,
+), $theme-colors);
+
+// Extend grays with transparent ones (for some reason, BS4 create black-50 and
+// white-50 but does not allow overridding that with variables). Also add black
+// and white ones too as they were also not added by BS4...
+$grays: () !default;
+$grays: map-merge(map-merge($o-transparent-grays, (
+    black: $black, // Note: those two needs to be redefined before bootstrap,
+    white: $white, // otherwise they do not exist yet
+)), $grays);
diff --git a/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss b/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss
deleted file mode 100644
index edd79516154..00000000000
--- a/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// Automatically extend bootstrap to create theme background/text/button classes
-$theme-colors: () !default;
-$theme-colors: map-merge((
-    'alpha': $color-alpha,
-    'beta': $color-beta,
-    'gamma': $color-gamma,
-    'delta': $color-delta,
-    'epsilon': $color-epsilon,
-), $theme-colors);
-
-// Extend grays with transparent ones (for some reason, BS4 create black-50 and
-// white-50 but does not allow overridding that with variables). Also add black
-// and white ones too as they were also not added by BS4...
-$grays: () !default;
-$grays: map-merge(map-merge($o-transparent-grays, (
-    black: $black, // Note: those two needs to be redefined before bootstrap,
-    white: $white, // otherwise they do not exist yet
-)), $grays);
-- 
cgit v1.2.3