Commit 949233aa1f205d81283e21c6804975ee2481bd54
1 parent
f5555784
Exists in
master
and in
4 other branches
Changed default icon for gravatar. Moved filter out of layout
Showing
3 changed files
with
3 additions
and
8 deletions
Show diff stats
app/assets/stylesheets/sections/events.scss
| @@ -123,6 +123,7 @@ | @@ -123,6 +123,7 @@ | ||
| 123 | .event_filter { | 123 | .event_filter { |
| 124 | position: absolute; | 124 | position: absolute; |
| 125 | width: 40px; | 125 | width: 40px; |
| 126 | + margin-left: -50px; | ||
| 126 | 127 | ||
| 127 | .filter_icon { | 128 | .filter_icon { |
| 128 | float: left; | 129 | float: left; |
| @@ -140,9 +141,3 @@ | @@ -140,9 +141,3 @@ | ||
| 140 | } | 141 | } |
| 141 | } | 142 | } |
| 142 | } | 143 | } |
| 143 | - | ||
| 144 | -.activities { | ||
| 145 | - .content_list { | ||
| 146 | - margin-left:50px; | ||
| 147 | - } | ||
| 148 | -} |
app/helpers/application_helper.rb
| @@ -36,7 +36,7 @@ module ApplicationHelper | @@ -36,7 +36,7 @@ module ApplicationHelper | ||
| 36 | else | 36 | else |
| 37 | gravatar_prefix = request.ssl? ? "https://secure" : "http://www" | 37 | gravatar_prefix = request.ssl? ? "https://secure" : "http://www" |
| 38 | user_email.strip! | 38 | user_email.strip! |
| 39 | - "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon" | 39 | + "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=mm" |
| 40 | end | 40 | end |
| 41 | end | 41 | end |
| 42 | 42 |
app/views/dashboard/index.html.haml
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | - if @events.any? | 13 | - if @events.any? |
| 14 | .content_list= render @events | 14 | .content_list= render @events |
| 15 | - else | 15 | - else |
| 16 | - %h4.nothing_here_message Projects activity will be displayed here | 16 | + %p.nothing_here_message Projects activity will be displayed here |
| 17 | .loading.hide | 17 | .loading.hide |
| 18 | .side | 18 | .side |
| 19 | - if @groups.present? | 19 | - if @groups.present? |