diff --git a/Changelog.md b/Changelog.md index f6a25f32d..c1bb557c2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index c5cae3a14..1d81d34b5 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -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 { diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 2439d8223..c335788e9 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -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)