Improve notifications and conversations views design

This commit is contained in:
flaburgan 2013-11-16 02:56:46 -08:00
parent 859cd83e38
commit 58886a6b30
4 changed files with 19 additions and 16 deletions

View file

@ -13,6 +13,7 @@
* Refactor ConversationsController#create, move more stuff to User model [#4551](https://github.com/diaspora/diaspora/pull/4551)
* Refactor MessagesController#create, move stuff to User model [#4556](https://github.com/diaspora/diaspora/pull/4556)
* Reorder the left bar side menu to put the stream first [#4569](https://github.com/diaspora/diaspora/pull/4569)
* Improve notifications and conversations views design on mobile [#4593](https://github.com/diaspora/diaspora/pull/4593)
## Bug fixes
* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)

View file

@ -7,8 +7,7 @@
a {
color: #2489ce;
text: {
decoration: none; };
text-decoration: none;
}
body {
@ -21,9 +20,12 @@ body {
padding-top: 55px;
}
h3 {
margin-top: 0px;
}
.message {
padding: {
left: 2px; };
padding-left: 2px;
}
.stream_element,
@ -306,7 +308,8 @@ body {
color: $text-grey; } }
.right {
float: right; }
float: right;
}
header {
position: fixed;
@ -670,6 +673,11 @@ select {
.notifications {
list-style: none;
margin: 0px;
}
.notifications_for_day {
margin-left: 12px;
}
.notification_day_header {
@ -698,10 +706,6 @@ display: inline-block;
width: 28px;
}
#conversation_inbox {
margin: 10px 0 0 10px;
}
.message_count {
border-radius: 2px 2px 2px 2px;
float: right;
@ -786,7 +790,6 @@ form#new_conversation.new_conversation {
border-bottom: 1px solid $border-dark-grey;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
border-radius: 5px;
margin: 5px 0 5px 15px;
padding: 5px 10px;
h4 {
font-size: 14px;

View file

@ -68,11 +68,10 @@
= link_to(image_tag('icons/compose_mobile2.png', class: 'compose_icon'), new_status_message_path)
#main.container{:role => "main"}
.row
- if current_page?(:activity_stream)
%h3
= t('streams.activity.title')
= yield
- if current_page?(:activity_stream)
%h3
= t('streams.activity.title')
= yield
- if user_signed_in?
= render :partial =>'shared/footer'

View file

@ -4,7 +4,7 @@
%h3
= t('.notifications')
%ul.stream.notifications
%ul.notifications
- @group_days.each do |day, notes|
%li
.notification_day_header