From c53afe586b1d896023eb3a24c3456c879ca349ac Mon Sep 17 00:00:00 2001 From: flaburgan Date: Tue, 10 Dec 2013 01:33:26 +0100 Subject: [PATCH] Add new icons to the mobile version --- .../images/icons/asterisk_white_mobile.png | Bin 0 -> 2658 bytes app/assets/images/icons/compose_mobile.png | Bin 1488 -> 1473 bytes app/assets/images/icons/mail_white.png | Bin 0 -> 992 bytes app/assets/images/icons/menu.png | Bin 1206 -> 262 bytes .../images/icons/notifications_white.png | Bin 0 -> 2357 bytes app/assets/stylesheets/mobile.css.scss | 116 ++++-------------- app/views/layouts/application.mobile.haml | 31 +++-- app/views/shared/_publisher.mobile.haml | 5 +- 8 files changed, 48 insertions(+), 104 deletions(-) create mode 100644 app/assets/images/icons/asterisk_white_mobile.png create mode 100644 app/assets/images/icons/mail_white.png create mode 100644 app/assets/images/icons/notifications_white.png diff --git a/app/assets/images/icons/asterisk_white_mobile.png b/app/assets/images/icons/asterisk_white_mobile.png new file mode 100644 index 0000000000000000000000000000000000000000..9fcb0eea8203407840d80a26fc0ddbe6c56959f3 GIT binary patch literal 2658 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 WU}!3a?u}B>&lV8Ii}?*aNc|5Y-IW9Y literal 1488 zcmZ`(eKgcr7{2pijoD@lC0}FxGIP{ONr_3!jCRaNMKvfLMHopXqpXkB@*|lsX_%=f zTR5|`&Zd%-M3!nI6l%}*p=l&D#PN|$wGn22+TC+@YxlhO-uHR#`@GM+=l*eXHu`f3 zcpE$bfWYUm1xRk0owzTM^+Iq(F_Nqke1j7L;&vt^h3}67KEk+&D2N{$9vvl!3Kyot zw?=sZV6>ml_6baWI;=e!tKk56)1?;hm5*(pEw8&&%PNMtO0}h9SiwS`XU2%hd4iHq zM0gT;8^l1>%bPw>o*R?Ub3)u>7D7oW&$o#WV0Qqbv-*q@{RMyqJV1!N78nfKa6_pJpPNs^3 z6{{pzB>W(h!@r~5#d5LJo>Kgm7Q>81!G>uvw_19~o#X=)VS+1_YZffX&ij9`+ zz9}~{fyzy|`>F6x?qt3kC~e}YUn7MkIr2W`*4zZ7kVxKy6lgt?Y%Iyoh&zu8?^;Xe zaM6;o?8rcbNa-A;rA!(*TWO>3;~+$)b3_P{p2n`ivPIiCuP=oyWCfCC(+&o2-1ToJ zfJCZ(;MT70O}KdL8LvBRg%l`%rO%%>)V3W}g)}aKobY#Q@IF;vu$x{i!nNW_7CE{( zipcDsP_!~4ehStGe#c5Q2jvgnG-jSQNqDVm*l(`B^Rv1{2QQ5Cgjx>9XnhM-yGoiMT)kmhrD<;1m$n6@ce*PR6pTcNE!KYXg?8076Au3UX7XsXk#*b17!?}Zv0LAbO1}FgA5Fj)dOQl^qzmv zA9jDL{-k-X!58znN#Tb>`oTi8l099`jXCY^Ub%0*8@fv<8toZC zOHVjDc107+>(9mHd&N3KZ?yL5x))tlO+l4E^Tc!=+?)52pX<)Nb#-QPLHxGU{{D&4VGXJl1vzr;FGi9fv%l``wN@t8&kpm{e&rR@&E?h Xt9vbUU!i(}e9?gK>(8!Ovm^5l5C&&8 diff --git a/app/assets/images/icons/mail_white.png b/app/assets/images/icons/mail_white.png new file mode 100644 index 0000000000000000000000000000000000000000..ad215505f1d920bd669c551dfc2494c59ad8f93c GIT binary patch literal 992 zcmV<610Vc}P)YtC(ut(=0V~vqPE#n#DzyfxHAxnBB>6hYj3i5HCIeDmlI|oICF$-+(v#$zBy*Bnp5*%^YEJ!X zU6T1#Rb7?j*d!mse|il2VJcq1R<#=1f_E?rlW<>yPj(piNg1>^Zp1qLGtS|y$D+dI zRJ^(UkLhQ^Cfr#_pMsUxJPyJ2;v-y!Jun-;?Kmhq39teumTi3x){Y~1KjJwYgk$jR z{|(G80)2<;u@5f5s&Vjc{1n%s16N}8&IV@y0sHU_rr}ULQvRW_ra$l!j>Hjoa3GU1 zhy^}ISEygP>AeTF%u>Mkie%}4`m{7VlPt8*Nl!iL=#+}2{*reg{g;Mc(f$PgEP z3m2D@`nqC&b~k;AdBvWbkM5xa$uJW5wiwENaauX4b{EgM9OsqX@4%X&2FfrK>BDO{ zqa<@PzG`!OvJjJTI-Vb{tH=l?_IWYi70$%VZ3ypeT#AXfp_t@hD?Fb2cw-ddt;W^Z6P?9+{XLQkq)CbYf){WA4k=f` z#sSl+gJx;j4U=&{erU!bY2pL)7K3_4sm2S78E>|J#!Z-j8Krx&rCE!m1rPKSo-7@W z!^``qSz3jYu~&h(w%HY*7Hy|3cptM$HFgyrIg-_WZvl5$xzqNx;=x)4aC;v%zd$@1 z%SIsP7sWbN#ip!jrJ-*%z(zH$C|!>Z+*a<`L(!6Qot%V6i?MI1Mgw3&-{6{3jWccg z<}jF3zO&3d$+jNesAx0+HmY$k_P4D~_7FDiV$SP0xK!^gt$NqBE5L?6#JQ!SI`!WL z-iTYvn5m^9FzRX-fbb{oDktd_yokTb&EY*9U#hOtAbWPrRE2i?h`v0@f~u-|FgMAh zBu^xnnB;*ZbK5D|b_AFt>yzA_WLZ^JeK;%0(@CbcTcYg>u%SgsHYJ%?Dls*{F{X|h zK@G45SOcs9)~W&40Be9Xz*;rH8ek2u23V^GSOcs9jvGx#(pzH~y8Z?BM|lG+8Me9r O0000FdgVmxoh~pKZ;Z#797($(}BbAs)xyPT9zN$brZ8{{9%p z=7fgH8ksNGC(QCW8uX@sTZL6fMEvrSh0a|(z4w{ozipq-aOMr0%!kxzCY#vaoyjq* zpBD96Qh~AB;m6{jQ=A^06(5zOvi%b-?0R%^_vL%Pm7mwJzLRvgB)Eg2`SS+Z7xJ;Q zZf?8usH0Af3V~5$F4&HK<6=dy85}Sb4q9e E0C>P*H2?qr literal 1206 zcmbVMZ)n_P7>}!)GHBUggS7~z=^PH1KX00(mvGmaOLF#b*L8QNEq*Ab$=hDq=8wsH zyR;w-duup zigfG@H7FLiLZHEl(>EQ$(sX~>nx3#^o7&$?reg&YxDc6S>`r=-5@)DYUIovSZI&We zP0&P!S`#%?7$7x2grvxH(-sE+DM<_vL`eesNS*^c%i&w1fuM+z!uODki^ASQdsHdv zxrQ&i%1{-A0)=I3wHj0FX8drB1+pwB96V2B3p$$ekQvin)YW9rVPu6)fE?c=6Gn5y zuc8cvm9B;028F^pu@^NGg;U1HX21f5V_i3iYt=eJMR-rfhSpJeDu8SeMt(K4@Og}O zHNiM{_ji;SVl~Ra(7}gdPU^l@b)kpydWOPZ7~8Rxlpz}c0Ga1_PD%lg;(0Y|s68oQ zqy&|hn;aWqWuR$NPM37CM+d;*RaMv3l#u0f-J+Vy>P>9ki;(GAu<6&qej8ZvzF0*I zp^5yk?E90=3K*#P$d4+1Kx!q4e7s;&1^3>+J(Q+%q9=j+0t^ z12@*qysnnxAC})!+pdz^jCS~A{ri@;KSjTsc=hbB<>7O+8=Ee3Uu|CK?5yv6^OVr} z_dDD6IHlp+2Oiy#9hhCnRd*fPBAk3+ma5Q~W{&Q7`d0n+De&bh-(9ZnequI0#2rqb zS?t|2vGURUWAyPCuixGLdAi*?cKYJG*}3=64gP%njkE3_U+jM9O!@0SzZF+zUmE|I z{qWdlCoYW7KiGR0F)LReS$4j;^Si(F>`waHb6uab-Q0BRnent(-`BwkzYQ)ey#D0U zVoGRxOItef+ICalwLP~yfAp_|Egg%AuzzNb6D>q(xGz6f-P@Y{N%BU&em?vB%l`st CrIs83 diff --git a/app/assets/images/icons/notifications_white.png b/app/assets/images/icons/notifications_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3f94e2848dbcdc8955a0bfb2369eee1612c071b1 GIT binary patch literal 2357 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 div { - display: inline; - font-weight: bold; - margin: 0 2px; - position: relative; - width: 28px; -} - .message_count { border-radius: 2px 2px 2px 2px; float: right; diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 1eeae2c54..6e9591d94 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -48,23 +48,30 @@ %body #app %header#main_nav - = link_to(image_tag('branding/header-logo2x.png', height: 40, width: 40), stream_path, id: 'header_title') + = link_to(image_tag('icons/asterisk_white_mobile.png'), stream_path, id: 'header_title') - if user_signed_in? - = link_to(image_tag('icons/menu.png', :class => 'menu'),"#", id: "menu_badge") - #nav_badges - = link_to(image_tag('icons/notifications_grey.png', height: 16, width: 16, id: 'notification-flag'), notifications_path, class: "badge badge-inverse", id: "notification_badge") - - if current_user.unread_notifications.count > 0 - .badge_count{id: "notification"} - = current_user.unread_notifications.count - = link_to(image_tag('icons/mail_grey.png', height: 11, width: 17), conversations_path, class: "badge badge-inverse", id: "conversations_badge") - - if current_user.unread_message_count > 0 - .badge_count{id: "conversation"} - = current_user.unread_message_count + -# Notifications + = link_to notifications_path, class: "badge", id: "notification_badge" do + = image_tag('icons/notifications_white.png') + - if current_user.unread_notifications.count > 0 + %span.badge_count{id: "notification"} + = current_user.unread_notifications.count + -# Conversations + = link_to conversations_path, class: "badge", id: "conversations_badge" do + = image_tag('icons/mail_white.png', id: 'conversation_icon') + - if current_user.unread_message_count > 0 + %span.badge_count{id: "conversation"} + = current_user.unread_message_count + -# Composition - if yield(:header_action).present? = yield(:header_action) - else - = link_to(image_tag('icons/compose_mobile2.png', class: 'compose_icon'), new_status_message_path) + = link_to(image_tag('icons/compose_mobile.png'), new_status_message_path, class: "badge") + -# Menu + = link_to(image_tag('icons/menu.png'), "#", id: "menu_badge", class: "badge") + + #main.container{:role => "main"} - if current_page?(:activity_stream) diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml index 23cd4d299..31720888a 100644 --- a/app/views/shared/_publisher.mobile.haml +++ b/app/views/shared/_publisher.mobile.haml @@ -9,9 +9,8 @@ = include_gon = form_for StatusMessage.new, {:data => {:ajax => false}} do |status| - #message_container - = status.hidden_field :provider_display_name, :value => 'mobile' - = status.text_area :text, :placeholder => t('.whats_on_your_mind'), :rows => 4, :autofocus => "autofocus" + = status.hidden_field :provider_display_name, :value => 'mobile' + = status.text_area :text, :placeholder => t('.whats_on_your_mind'), :rows => 4, :autofocus => "autofocus" %fieldset %span#publisher_service_icons