From c9b58c9ff65250e0edb870ff7c55501f55748988 Mon Sep 17 00:00:00 2001 From: movilla Date: Fri, 26 Oct 2012 22:47:43 +0200 Subject: [PATCH 1/2] Add My Activity icon mobile --- Changelog.md | 1 + app/assets/images/icons/my_activity.png | Bin 0 -> 663 bytes app/assets/stylesheets/mobile.css.scss | 2 ++ app/views/layouts/application.mobile.haml | 31 +++++++++++----------- 4 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 app/assets/images/icons/my_activity.png diff --git a/Changelog.md b/Changelog.md index 2d7e6f59a..f6a25f32d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -19,6 +19,7 @@ ## Features +* Add "My Activity" icon mobile. [#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/images/icons/my_activity.png b/app/assets/images/icons/my_activity.png new file mode 100644 index 0000000000000000000000000000000000000000..cba2cee8d5c9bc056fddfa5d138d440683684fbf GIT binary patch literal 663 zcmV;I0%-k-P)Px#24YJ`L;x!QD*!9k_Vp_O000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyu8 z4mKnG*%YGy00I|DL_t(I%axO{YAQh#hX2{5xVJNJVBTN@d4ZIhAh?@O2$%;5=01V= z1Zow6O~6{s&Z^kODrK^%ZmAJ$qk=+o=A3gIH!PyX{j1^pXFkq$cg89N<>aXq{7TDGmoMu%41hr>!Q|L zqA0pg*9U_^dJ05Qbg#7*t@RH?wOXx=Qfj1>s`$QN>-BnBrBqcZl?5;dkP(rwi2S*_ zx*B&noqG`}i^%Eq_4V9g<}wk*zVFwN|- zL=-b~82}t>?Ku%W0Dv*3YOTG^<#NMxgj_B+wAS7lW2yi^L=V>5a{zFd`HPwRTL6L} z7;g9SZj2det=|D42!f$81^~d!eP;dw0LK{fQ79CaPft%L>-D+^0L^AIyI3sT`FxJW zV&NtWOZ-Biur$VeBoX4r$H(Jhu{c|=*RKF@b8|DEPN(r?GQo5@jZ=VE0BAHCzpb?~ z032Iu-qi508rSYcDpURwIB%g_8#vmet&<*+wl{{IH0|N)oK;)0K)$QESJmY x!*kM{sE0TSKTPa@|*ww002ovPDHLkV1n9cC6)jH literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index 0e536122d..c5cae3a14 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -292,6 +292,8 @@ body { #nav_badges { display: inline-block; + float: right; + padding: 4px 12px; } #nav_badges a:hover { text-decoration: none; } diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 5b17a90e8..2439d8223 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -1,6 +1,6 @@ --# Copyright (c) 2010-2011, Diaspora Inc. This file is --# licensed under the Affero General Public License version 3 or later. See --# the COPYRIGHT file. +-# Copyright (c) 2010-2011, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. !!! %html{:lang => I18n.locale.to_s, :dir => (rtl?) ? 'rtl' : 'ltr'} @@ -49,29 +49,25 @@ .navbar-inner .container{:style => "position: relative;"} = link_to(image_tag('branding/header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path) + - if user_signed_in? - #header-nav - .activity-nav - = link_to(t('streams.activity.title'), activity_stream_path) - #nav_badges - .badge{:class => "badge-inverse", :id => "notification_badge"} + .badge{:class => "badge-inverse", :id => "contacts_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) - if current_user.unread_notifications.count > 0 .badge_count = current_user.unread_notifications.count - .badge{:class => "badge-inverse", :id => "conversations_badge"} + .badge{:class => "badge-inverse", :id => "conversations_badge"} = link_to(image_tag('icons/mail_grey.png', :height => 11, :width => 17), conversations_path) - if current_user.unread_message_count > 0 .badge_count = current_user.unread_message_count - .badge{:class => "badge-inverse", :id => "people_badge"} - = link_to(image_tag('icons/search_grey.png', :height => 14, :width => 14), people_path) - .badge{:class => "badge-inverse", :id => "contacts_badge"} - = link_to(image_tag('icons/user_grey.png', :height => 16, :width => 16), contacts_path) - - - if user_signed_in? - .right + .badge{:class => "badge-inverse", :id => "people_badge"} + = link_to(image_tag('icons/search_grey.png', :height => 14, :width => 14), people_path) + .badge{:class => "badge-inverse", :id => "contacts_badge"} + = link_to(image_tag('icons/user_grey.png', :height => 16, :width => 16), contacts_path) - if yield(:header_action).present? = yield(:header_action) - else @@ -79,6 +75,9 @@ #main.container{:role => "main"} .row + - if current_page?(:activity_stream) + %h3 + = t('streams.activity.title') = yield - if user_signed_in? From 880b16f5301dfd8f2a2e69228d35bb595182db97 Mon Sep 17 00:00:00 2001 From: movilla Date: Mon, 29 Oct 2012 12:14:19 +0100 Subject: [PATCH 2/2] Add My Activity icon mobile --- Changelog.md | 2 +- app/assets/stylesheets/mobile.css.scss | 4 ++-- app/views/layouts/application.mobile.haml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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)