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

Add My Activity icon mobile

Browse source
This commit is contained in:
movilla 2012-10-29 12:14:19 +01:00
parent c9b58c9ff6
commit 880b16f530
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -19,7 +19,7 @@
## Features ## 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) * Add password_confirmation field to registration page. [#3647](https://github.com/diaspora/diaspora/pull/3647)
## Bug Fixes ## Bug Fixes

4
app/assets/stylesheets/mobile.css.scss
View file

@ -293,7 +293,7 @@ body {
#nav_badges { #nav_badges {
display: inline-block; display: inline-block;
float: right; float: right;
padding: 4px 12px; padding: 4px 12px;
} }
#nav_badges a:hover { #nav_badges a:hover {
text-decoration: none; } text-decoration: none; }
@ -605,7 +605,7 @@ select {
.compose_icon { .compose_icon {
height: 28px; height: 28px;
width: 28px; width: 28px;
margin-top: 3px; margin-left: 10px;
} }
.navbar-inner .right { .navbar-inner .right {

2
app/views/layouts/application.mobile.haml
View file

@ -52,7 +52,7 @@
- if user_signed_in? - if user_signed_in?
#nav_badges #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) = link_to(image_tag('icons/my_activity.png', :height => 16, :width => 16), activity_stream_path)
.badge{:class => "badge-inverse", :id => "notification_badge"} .badge{:class => "badge-inverse", :id => "notification_badge"}
= link_to(image_tag('icons/notifications_grey.png', :height => 16, :width => 16, :id => 'notification-flag'), notifications_path) = link_to(image_tag('icons/notifications_grey.png', :height => 16, :width => 16, :id => 'notification-flag'), notifications_path)