twisterarmy/theme_nin
1
0
Fork 0
mirror of https://github.com/twisterarmy/theme_nin.git synced 2025-01-30 16:44:31 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Simon Grim 2015-08-21 09:55:01 +05:00
parent 9821771f8b
commit b25181793e
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/style.css
View File

@ -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;

8
sass/layout/_modal.sass
View File

@ -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

4
sass/layout/_prompt.sass
View File

@ -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