From b25181793e5723d215704742db5ca5e625114f74 Mon Sep 17 00:00:00 2001
From: Simon Grim <scary@tasty.sexy>
Date: Fri, 21 Aug 2015 09:55:01 +0500
Subject: [PATCH] fix merge conflicts

---
 css/style.css            | 7 -------
 sass/layout/_modal.sass  | 8 --------
 sass/layout/_prompt.sass | 4 +++-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/css/style.css b/css/style.css
index 00acb9a..957cb0d 100644
--- a/css/style.css
+++ b/css/style.css
@@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   right: 35px;
 }
 
-.switch-mode {
-  cursor: pointer;
-  color: #A1B775;
-  position: absolute;
-  left: 0;
-}
-
 /* Composants */
 .twister-user {
   position: relative;
diff --git a/sass/layout/_modal.sass b/sass/layout/_modal.sass
index 9290485..d80db79 100644
--- a/sass/layout/_modal.sass
+++ b/sass/layout/_modal.sass
@@ -187,14 +187,6 @@ $header-modal-height : $menu-height
 
 
 
-.switch-mode
-	cursor: pointer 
-	color: $main-color-color
-	position: absolute 
-	left: 0
-	@extend .ion 
-	@extend .ion-shuffle
-
 /* Composants */
 
 .twister-user
diff --git a/sass/layout/_prompt.sass b/sass/layout/_prompt.sass
index e9c43bb..72b1106 100644
--- a/sass/layout/_prompt.sass
+++ b/sass/layout/_prompt.sass
@@ -34,10 +34,12 @@
 		display: inline-block
 		float: left
 		margin: 12px 4px 4px
-		color: lighten($dark-grey,30%)
+		color: $main-color-color
 		cursor: pointer
 		font-size: .8rem
 		line-height: .8rem
+		@extend .ion
+		@extend .ion-shuffle