fix merge conflicts

9 years ago · b25181793e
3 changed files with 3 additions and 16 deletions
--- a/css/style.css
+++ b/css/style.css
@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
				@@ -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;
--- a/sass/layout/_modal.sass
+++ b/sass/layout/_modal.sass
@ -187,14 +187,6 @@ $header-modal-height : $menu-height
				@@ -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
--- a/sass/layout/_prompt.sass
+++ b/sass/layout/_prompt.sass
@ -34,10 +34,12 @@
				@@ -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