diff --git a/app/assets/stylesheets/common/foundation/base.css.scss b/app/assets/stylesheets/common/foundation/base.css.scss
index 670b1018a26..39da9f97995 100644
--- a/app/assets/stylesheets/common/foundation/base.css.scss
+++ b/app/assets/stylesheets/common/foundation/base.css.scss
@@ -1,5 +1,5 @@
-@import "variables";
-@import "mixins";
+@import "common/foundation/variables";
+@import "common/foundation/mixins";
 
 // --------------------------------------------------
 // Base styles for HTML elements
diff --git a/app/assets/stylesheets/vendor/bootstrap.css b/app/assets/stylesheets/vendor/bootstrap.scss
similarity index 99%
rename from app/assets/stylesheets/vendor/bootstrap.css
rename to app/assets/stylesheets/vendor/bootstrap.scss
index 17467e4fee4..02eb1bb4bb0 100644
--- a/app/assets/stylesheets/vendor/bootstrap.css
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -12,7 +12,7 @@
  * no longer required.
  */
 
- @import "foundation/mixins";
+ @import "common/foundation/mixins";
 
 a:focus {
   outline: thin dotted #333;