nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4667 from Flaburgan/fix-markdown-display

Browse source 
Fix markdown indication in the publisher when the user upload an image
This commit is contained in:
Jonne Haß 2014-01-06 02:22:21 -08:00
commit 7c9460d5b0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/mentions.css.scss
View file

@ -94,5 +94,3 @@
} }
} }
} }
#publisher .mentions-autocomplete-list ul { width: 483px; }

11
app/assets/stylesheets/publisher.css.scss
View file

@ -37,6 +37,10 @@
margin-bottom: 30px; margin-bottom: 30px;
} }
} }
.mentions-autocomplete-list ul {
width: 483px;
}
.options_and_submit { .options_and_submit {
min-height: 21px; min-height: 21px;
@ -165,6 +169,11 @@
@include opacity(1); @include opacity(1);
} }
} }
.markdownIndications {
position: absolute;
bottom: 0px;
}
@include border-radius(2px); @include border-radius(2px);
@ -195,7 +204,7 @@
#photodropzone { #photodropzone {
z-index: 3; z-index: 3;
position: absolute; position: absolute;
bottom: 0; bottom: 15px;
right: 35px; right: 35px;
width: 430px; width: 430px;
left: 5px; left: 5px;