From 41a2b9bf0ff16872de0fdbeb34d26ea0065197be Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Mon, 28 Nov 2016 13:36:30 -0500 Subject: [PATCH] move notification icon to be visible outside the account menu --- app/assets/images/.DS_Store | Bin 16388 -> 0 bytes app/assets/images/topright_sprite.png | Bin 1646 -> 3445 bytes app/assets/images/user_sprite.png | Bin 2264 -> 2706 bytes app/assets/stylesheets/application.scss.erb | 21 +----------------- app/assets/stylesheets/clean.css.erb | 7 ++++-- app/assets/stylesheets/mobile.scss.erb | 2 +- ...ifications.scss => notifications.scss.erb} | 17 ++++++++++++++ app/views/layouts/_account.html.erb | 10 --------- app/views/layouts/_upperelements.html.erb | 14 +++++++++--- 9 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 app/assets/images/.DS_Store rename app/assets/stylesheets/{notifications.scss => notifications.scss.erb} (73%) diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store deleted file mode 100644 index 2bbe5f6a30a17587916373a8968facc58339b0db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16388 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 diff --git a/app/assets/images/topright_sprite.png b/app/assets/images/topright_sprite.png index 163dd6f7330b3323bf0e6d498a0c270a28cafc5c..4c969887dd42f30ac81eab16de5969d56c4dd85e 100644 GIT binary patch literal 3445 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 X&6~pKtb@=s00000NkvXXu0mjfF#c`> literal 1646 zcmV-!29f!RP)B&0pP<309a}OunIn42_+1B$_$qpbd%>w2k)i-B~J#( z`n%+SfacYW_m`B{0l+aJb^#z48+?-fuL8h7(tl@Z`WAp~iU@_E-{0T&lFbg_^6y;; z5R^U=%BfgB9!q7$chdiaz@y*Z-hPqC{*(SIhyN7-NVOnTL%&ahPe8Db0aOVM@N-?) zEd>C&d~YTFr(Cpex<-t{xqPonX%Z?5_^#3wFD_aga&?}S@9Nisk1pR^PYnQA{Xg0! zTfYB?(g&%l=#bN)ng|7eCY*YpQ(9$&IxvF=0K^ag?(XiIh;&lrpnbHDK9em!_nY(| z5*c8hkpcEG3}8~vSY<>6zju|e7%-rF69AMJ5R>J$o12@@zLPFL{!6L?&H(~AM+o{M zXKTJ606{zCv>6q%R{>OSp#Kd5L%wcLqQun#UZf040YPZ+Efm`8Io&46Pz0(jWgU6l zS`Ri{Qyyy(2mlH^zbY9!_&hj#u6W5@8UQIE$Ps)B0=lX(xR!Z&@fCfJrWUOJ)&vd+ zKB*2i11Y0y-((B`#DE}Y@aa7m(m`8r%(YASseZwBNHh)sXm$Vy0YQo26Jfg2#a*du zVKv|qeYUCrQ^;8Wzy|~+gHP!_L=P|kMgqYY!6)PHL+krc1L{`*SUPkt=pdAr}wXO%~)^jEScnqwqRD`|&3PB41#MuErZE8#gfFV7AAW)k@JDIGB*?6SfDlRf~HeF7E#P;l{cXSwQ65dew_ zHXdzYuWq1iBZyFaJIZe&a&N}u6pE(=0Bj%o?guyku(64`QGX1>0EntiI@?a5t1awk z>a=5{ngI~mHr6zNw-|IVz?uOt0{~zZ5V;E|EZe{r|341js9i%d=wy^Hl!ytx2Q*ay zOO84l8yg!N8ylN6Aw+$3b+wbemw)r~0WQt1udiF_2Xvm1%VU5BgAXh~jxXi0PQGrW zS3FNb=yNpJLA3H^O^#KH1t8dObuy#{1O|YB0q_cd*|H?$dP?;$Alv5w=?sAJ0Ptai z0W38DG>*@&0R+-}$_$qpbd%>w2gm0FC}b6VJ^;|Xy7B&!^14u#8vwc3;P`w1buxZF zz_)2=n<7Gixu}*=rS2-=`<3|L8k#aC|<1Be!IEK0wCcTzYf;9uNfj=d|zW0RQ5Q z@57_*yFCj4_<*2f@F~5A=m7@6NFW#^_(bIOr6(C%xHb`K&;q93!TIfony9#Ft~2Cb zLz%Xr_m^RDwYG&ts{vE%xO9q|8USKS09f?E2FpN|8breRHzok69>Gp;E)Aq6u{cLN z1prW**2_aJMRXw=L2m-#?;5ng8#{uz+rA8dfR*Y|nKY5(nx++;dow1dP&_37(0uK) z9}o+s(Zw7CAgXcG*~&3jTbQ(v50j6N0g%)-?qkH5g8|kIfEfUQQ~@!&fI~fwe!=Ff s!^H{R-zxF9BNiYcXrh^PTzo~Ef^P(DV)WKFpy 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 e{B_#UuT@); + background-image: url(<%= asset_path('user_sprite.png') %>); } .accountSettings .accountIcon { background-position: 0 0; @@ -837,9 +837,6 @@ label { .accountApps .accountIcon { background-position: 0 -32px; } -.accountNotifications .accountIcon { - background-position: 0 -128px; -} .accountInvite .accountIcon { background-position: 0 -64px; } @@ -854,12 +851,6 @@ label { .accountListItem:hover a { color: #424242; } -.accountNotifications { - position: relative; -} -.accountNotifications.unread a { - font-weight: 900; -} .accountListItem:hover .accountIcon { background-position-x: -32px; } @@ -867,16 +858,6 @@ li.accountInvite span { display: block; padding: 9px 0 9px 62px; } -$unread_notifications_dot_size: 8px; -.unread-notifications-dot { - width: $unread_notifications_dot_size; - height: $unread_notifications_dot_size; - background-color: #e22; - border-radius: $unread_notifications_dot_size / 2; - position: absolute; - top: 0; - right: 0; -} .accountImage { background-image: url(<%= asset_data_uri 'user.png' %>); background-size: 84px 84px; diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index 7902b580..b25816f0 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -210,7 +210,10 @@ } .addMap { background-position: -96px 0; - margin-right:10px; +} +.notificationsIcon { + background-position: -128px 0; + margin-right: 10px; // make it look more natural next to the account menu icon } .importDialog:hover { background-position: 0 -32px; @@ -758,7 +761,7 @@ } .exploreMapsCenter .authedApps .exploreMapsIcon { - background-image: url(<%= asset_data_uri('user_sprite.png') %>); + background-image: url(<%= asset_path('user_sprite.png') %>); background-position: 0 -32px; } .exploreMapsCenter .myMaps .exploreMapsIcon { diff --git a/app/assets/stylesheets/mobile.scss.erb b/app/assets/stylesheets/mobile.scss.erb index 42576bb5..e7eb9a7d 100644 --- a/app/assets/stylesheets/mobile.scss.erb +++ b/app/assets/stylesheets/mobile.scss.erb @@ -213,7 +213,7 @@ line-height: 50px; } -#menu_icon .unread-notifications-dot { +#mobile_header #menu_icon .unread-notifications-dot { top: 5px; left: 29px; width: 12px; diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss.erb similarity index 73% rename from app/assets/stylesheets/notifications.scss rename to app/assets/stylesheets/notifications.scss.erb index 95564a51..b25bf4e8 100644 --- a/app/assets/stylesheets/notifications.scss +++ b/app/assets/stylesheets/notifications.scss.erb @@ -1,3 +1,20 @@ +$unread_notifications_dot_size: 8px; +.unread-notifications-dot { + width: $unread_notifications_dot_size; + height: $unread_notifications_dot_size; + background-color: #e22; + border-radius: $unread_notifications_dot_size / 2; + position: absolute; + top: 0; + right: 0; +} + +.upperRightUI { + .notificationsIcon { + position: relative; + } +} + .controller-notifications { ul.notifications { list-style: none; diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb index 1c1cddf0..3d66f687 100644 --- a/app/views/layouts/_account.html.erb +++ b/app/views/layouts/_account.html.erb @@ -8,16 +8,6 @@ <%= image_tag account.image.url(:sixtyfour), :size => "48x48", :class => "sidebarAccountImage" %>

<%= account.name.split[0...1][0] %>

    - <% if current_user.present? %> -
  • -
    - <% if user_has_unread_notifications? %> -
    - <% end %> -
    - <%= link_to "Notifications", notifications_path %> -
    • - <% end %>
  • <%= link_to "Account", edit_user_url(account) %> diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index e560eadf..cc484272 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -71,12 +71,20 @@ <% end %> + <% if current_user.present? %> + <%= link_to notifications_path, target: '_blank', class: "notificationsIcon upperRightEl upperRightIcon #{user_has_unread_notifications? ? 'unread' : 'read'}" do %> +
    + Notifications +
    + <% if user_has_unread_notifications? %> +
    + <% end %> + <% end %> + <% end %> + <% if !(controller_name == "sessions" && action_name == "new") %>
    - <% if user_has_unread_notifications? %> -
    - <% end %>
    Account
    <% if current_user && current_user.image %> <%= image_tag current_user.image.url(:thirtytwo), :size => "32x32" %>