nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure to import perfect scrollbar plugin before our own mixins

Browse source 
otherwise it overrides the border-radius mixin with an incompatible one
This commit is contained in:
Jonne Haß 2014-11-09 20:31:24 +01:00
parent e0a2c6438a
commit e68704890e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/application.css.scss
View file

@ -1,4 +1,6 @@
@import "compass"; @import "compass";
@import "perfect-scrollbar";
@import "colors"; @import "colors";
@import "ui"; @import "ui";
@import "_mixins"; @import "_mixins";
@ -24,7 +26,6 @@
@import "tag"; @import "tag";
@import "photo"; @import "photo";
@import "perfect-scrollbar";
/* ====== media ====== */ /* ====== media ====== */
.media { .media {

3
app/assets/stylesheets/new-templates.css.scss
View file

@ -1,8 +1,9 @@
@import 'perfect-scrollbar';
@import "colors"; @import "colors";
@import 'mixins'; @import 'mixins';
@import 'new_styles/new_mixins'; @import 'new_styles/new_mixins';
@import 'new_styles/variables'; @import 'new_styles/variables';
@import 'perfect-scrollbar';
/* core */ /* core */
@import 'flash_messages'; @import 'flash_messages';