aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/stylesheets/modules
diff options
context:
space:
mode:
authorcedricnjanga2017-09-19 15:56:09 +0200
committercedricnjanga2017-09-19 15:56:09 +0200
commitd0703700f5b5e663739e9897c04c2136c953fa7e (patch)
tree91b9cbf1568556ae65162fec2fe23b1ea58da784 /app/assets/stylesheets/modules
parentefa8b6072e35f09d580f227b0b3175260c145fea (diff)
parent5ffc337dfc86017840a5402058d490fd20d29bf4 (diff)
downloadchouette-core-d0703700f5b5e663739e9897c04c2136c953fa7e.tar.bz2
Resolve merge conflicts
Diffstat (limited to 'app/assets/stylesheets/modules')
-rw-r--r--app/assets/stylesheets/modules/import_messages.sass5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/modules/import_messages.sass b/app/assets/stylesheets/modules/import_messages.sass
new file mode 100644
index 000000000..e5666cbcd
--- /dev/null
+++ b/app/assets/stylesheets/modules/import_messages.sass
@@ -0,0 +1,5 @@
+.import_messages
+ .status_icon
+ padding-right: 20px
+ h1
+ padding-bottom: 20px