Improving design

This commit is contained in:
Eugen Rochko 2016-02-26 21:11:52 +01:00
parent 24646d5769
commit fa29ef3a41
5 changed files with 63 additions and 15 deletions

View File

@ -1,3 +1,10 @@
// Place all the styles related to the Home controller here. .footer {
// They will automatically be included in application.css. text-align: center;
// You can use Sass (SCSS) here: http://sass-lang.com/ padding: 100px 0;
.mastodon-link {
color: #566270;
text-decoration: none;
font-size: 16px;
}
}

View File

@ -53,25 +53,27 @@ body {
.activity-stream { .activity-stream {
clear: both; clear: both;
box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
.entry { .entry {
padding: 10px;
border-bottom: 1px solid #E0E3DA; border-bottom: 1px solid #E0E3DA;
background: #FFFFF3; background: #FFFFF3;
border-left: 2px solid #A593E0;
&:first-child { &.entry-reblog {
border-radius: 5px 5px 0 0; border-left: 2px solid #566270;
} }
&:last-child { &:last-child {
border-bottom: 0; border-bottom: 0;
border-radius: 0 0 5px 5px;
} }
} }
.header { .header {
margin-bottom: 10px; margin-bottom: 10px;
} padding: 10px;
padding-bottom: 0;
padding-left: 8px;
.name { .name {
text-decoration: none; text-decoration: none;
@ -87,9 +89,29 @@ body {
} }
} }
} }
}
.pre-header {
border-bottom: 1px solid #E0E3DA;
color: #566270;
padding: 5px 10px;
padding-left: 8px;
.name {
color: #566270;
font-weight: bold;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
}
.content { .content {
font-size: 16px; font-size: 16px;
padding: 0 10px;
padding-left: 8px;
} }
.time { .time {
@ -105,10 +127,19 @@ body {
margin-top: 15px; margin-top: 15px;
color: #566270; color: #566270;
cursor: default; cursor: default;
padding: 10px;
padding-top: 0;
padding-left: 8px;
.counter { .counter {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
.conversation-link {
color: #A593E0;
text-decoration: underline;
float: right;
}
} }
} }

View File

@ -9,3 +9,5 @@
%body %body
.container .container
= yield = yield
.footer
= link_to 'Mastodon', 'https://github.com/Gargron/mastodon', class: 'mastodon-link'

View File

@ -1,4 +1,9 @@
%div.entry %div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' }
- if status.reblog?
.pre-header
%i.fa.fa-retweet
Shared by
= link_to status.account.display_name.blank? ? status.account.username : status.account.display_name, (status.account.local? ? profile_url(name: status.account.username) : status.account.url), class: 'name'
.header .header
= render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status } = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
.content .content

View File

@ -5,3 +5,6 @@
.counter.counter-favourites .counter.counter-favourites
%i.fa.fa-star %i.fa.fa-star
%span.num= status.favourites.count %span.num= status.favourites.count
- if status.reply?
= link_to 'View conversation', status.thread.local? ? status_url(name: status.thread.account.username, id: status.thread.id) : status.thread.url, class: 'conversation-link'