ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-15 22:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes shoutbox styling

Browse source
This commit is contained in:
Luke Barratt 2014-05-10 13:43:40 +01:00
parent 314d47b7bf
commit 9156865068
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/components/_gather.scss
View file

@ -35,7 +35,12 @@
} }
.shoutbox-messages { .shoutbox-messages {
@include span-columns(12); display: table;
width: 100%;
.user {
width: 10%;
}
.timestamp { .timestamp {
margin: 0 5px 5px; margin: 0 5px 5px;

14
app/assets/stylesheets/components/_shoutbox.scss
View file

@ -10,9 +10,12 @@
display: table-row; display: table-row;
margin-bottom: 5px; margin-bottom: 5px;
clear: both; clear: both;
position: relative;
.timestamp { .destroy {
@extend .highlight; position: absolute;
top: 0;
right: -10px;
} }
.user { .user {
@ -34,6 +37,11 @@
.message { .message {
max-width: 66%; max-width: 66%;
display: table-cell; display: table-cell;
padding-left: 10px;
.contents {
position: relative;
display: block;
padding: 0 10px;
}
} }
} }

10
app/views/shoutmsgs/_shoutmsg.html.erb
View file

@ -1,9 +1,6 @@
<div class="shoutmsg"> <div class="shoutmsg">
<div class="user"> <div class="user">
<span class="username"> <span class="username">
<% if shoutmsg.can_destroy? cuser %>
<%= link_to icon('times'), shoutmsg, method: :delete %>
<% end %>
<%= namelink shoutmsg.user %> <%= namelink shoutmsg.user %>
</span> </span>
<span class="time"> <span class="time">
@ -11,6 +8,11 @@
</span> </span>
</div> </div>
<div class="message"> <div class="message">
<%= shoutmsg.text %> <div class="contents">
<%= shoutmsg.text %>
<% if shoutmsg.can_destroy? cuser %>
<%= link_to icon('times'), shoutmsg, method: :delete, class: 'destroy' %>
<% end %>
</div>
</div> </div>
</div> </div>