From e68704890e52fbd10a4f09ac2ec8433cfbf968ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 9 Nov 2014 20:31:24 +0100
Subject: [PATCH] make sure to import perfect scrollbar plugin before our own
mixins
otherwise it overrides the border-radius mixin with an incompatible one
---
app/assets/stylesheets/application.css.scss | 3 ++-
app/assets/stylesheets/new-templates.css.scss | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index e0ab35fa4c..1d2a9b2558 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1,4 +1,6 @@
@import "compass";
+@import "perfect-scrollbar";
+
@import "colors";
@import "ui";
@import "_mixins";
@@ -24,7 +26,6 @@
@import "tag";
@import "photo";
-@import "perfect-scrollbar";
/* ====== media ====== */
.media {
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index 63ccacb285..2b11270c92 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -1,8 +1,9 @@
+@import 'perfect-scrollbar';
+
@import "colors";
@import 'mixins';
@import 'new_styles/new_mixins';
@import 'new_styles/variables';
-@import 'perfect-scrollbar';
/* core */
@import 'flash_messages';
--
GitLab