mirror of
https://github.com/twisterarmy/theme_nin.git
synced 2025-01-30 16:44:31 +00:00
fix merge conflicts
This commit is contained in:
parent
9821771f8b
commit
b25181793e
@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
|
|||||||
right: 35px;
|
right: 35px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.switch-mode {
|
|
||||||
cursor: pointer;
|
|
||||||
color: #A1B775;
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Composants */
|
/* Composants */
|
||||||
.twister-user {
|
.twister-user {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -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 */
|
/* Composants */
|
||||||
|
|
||||||
.twister-user
|
.twister-user
|
||||||
|
@ -34,10 +34,12 @@
|
|||||||
display: inline-block
|
display: inline-block
|
||||||
float: left
|
float: left
|
||||||
margin: 12px 4px 4px
|
margin: 12px 4px 4px
|
||||||
color: lighten($dark-grey,30%)
|
color: $main-color-color
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
font-size: .8rem
|
font-size: .8rem
|
||||||
line-height: .8rem
|
line-height: .8rem
|
||||||
|
@extend .ion
|
||||||
|
@extend .ion-shuffle
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user