Commit 880b16f5 authored by movilla's avatar movilla

Add My Activity icon mobile

parent c9b58c9f
......@@ -19,7 +19,7 @@
## Features
* Add "My Activity" icon mobile. [#3687](https://github.com/diaspora/diaspora/pull/3687)
* Add "My Activity" icon mobile -[Author Icon](http://www.gentleface.com/free_icon_set.html)-. [#3687](https://github.com/diaspora/diaspora/pull/3687)
* Add password_confirmation field to registration page. [#3647](https://github.com/diaspora/diaspora/pull/3647)
## Bug Fixes
......
......@@ -293,7 +293,7 @@ body {
#nav_badges {
display: inline-block;
float: right;
padding: 4px 12px;
padding: 4px 12px;
}
#nav_badges a:hover {
text-decoration: none; }
......@@ -605,7 +605,7 @@ select {
.compose_icon {
height: 28px;
width: 28px;
margin-top: 3px;
margin-left: 10px;
}
.navbar-inner .right {
......
......@@ -52,7 +52,7 @@
- if user_signed_in?
#nav_badges
.badge{:class => "badge-inverse", :id => "contacts_badge"}
.badge{:class => "badge-inverse", :id => "my_activity_badge"}
= link_to(image_tag('icons/my_activity.png', :height => 16, :width => 16), activity_stream_path)
.badge{:class => "badge-inverse", :id => "notification_badge"}
= link_to(image_tag('icons/notifications_grey.png', :height => 16, :width => 16, :id => 'notification-flag'), notifications_path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment