Merge branch 'hotfix/0.107.6'

CenterForOpenScience · May 3, 2017 · 21f1027 · 21f1027
2 parents 398e6b9 + 6ec1c2a
commit 21f1027
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
@@ -4,3 +4,4 @@ $preprint-title: #D2D2D2;
 $preprint-title-hover: #D5E6ED;
 $gradient-percentage: 15%;
 $nav-bar-height: 25px;
+$carousel-control-width: 10%;
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -1,7 +1,8 @@
+/* Import variables before bootstrap so that boostrap variables can be overridden */
+@import 'variables';
 @import 'bootstrap';
 @import 'ember-power-select';
 @import 'base';
-@import 'variables';
 @import 'authors';
 @import 'validated-input';
 @import 'hint';