[skip ci] polyfill .hidden selector

3 files changed, 17 insertions, 7 deletions

diff --git a/app/assets/stylesheets/framework.bs3.scss b/app/assets/stylesheets/bootstrap_migration.scss
index c895da5023c..fce08da3794 100644
--- a/app/assets/stylesheets/framework.bs3.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -1,3 +1,7 @@
+/*
+ *  Scss to help with bootstrap 3 to 4 migration
+ */
+
 $text-color: $gl-text-color;
 
 $brand-primary: $gl-primary;
@@ -14,3 +18,15 @@ $input-border-focus: $focus-border-color;
 
 $padding-base-vertical: $gl-vert-padding;
 $padding-base-horizontal: $gl-padding;
+
+html {
+  // Override default font size used in bs4
+  font-size: 14px;
+}
+
+// Polyfill deprecated selectors
+
+.hidden {
+  @extend .d-none;
+  @extend .invisible;
+}
diff --git a/app/assets/stylesheets/framework.bs4.scss b/app/assets/stylesheets/framework.bs4.scss
deleted file mode 100644
index bd1627d2d77..00000000000
--- a/app/assets/stylesheets/framework.bs4.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Override variables from bs4
-
-html {
-  font-size: 14px;
-}
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index dba97281c38..14e7b38fffc 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -1,8 +1,7 @@
 @import "framework/variables";
 @import "framework/mixins";
-@import "framework.bs4";
 @import "../../../node_modules/bootstrap/scss/bootstrap";
-@import "framework.bs3";
+@import "bootstrap_migration";
 @import "framework/layout";
 
 @import "framework/animations";