mirrors/retrospring
1
0
Fork 0
mirror of https://github.com/Retrospring/retrospring.git synced 2025-02-07 15:53:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git.rrerr.net:justask/justask

Browse source
This commit is contained in:
nilsding 2014-12-12 17:24:38 +01:00
commit 21282961b3
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/scss/entry.scss
View file

@ -9,3 +9,7 @@
.entry-text { .entry-text {
margin-bottom: 0px; margin-bottom: 0px;
} }
.entry-about {
margin-top: 0px;
}

1
app/helpers/application_helper.rb
View file

@ -52,6 +52,7 @@ module ApplicationHelper
def gravatar_url(user) def gravatar_url(user)
return '//www.gravatar.com/avatar' if user.nil? return '//www.gravatar.com/avatar' if user.nil?
return "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user)}" if user.is_a? String
"//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user.email)}" "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user.email)}"
end end

18
app/views/static/about.html.haml
View file

@ -16,10 +16,20 @@
%h3 The Team %h3 The Team
The people behind justask! The people behind justask!
%br/ %br/
%ul .media
- @admins.each do |user| .pull-left
%li %a{href: show_user_profile_path('nilsding')}
%a= link_to user.screen_name, show_user_profile_path(user.screen_name) %img.img-rounded.answerbox--img{src: gravatar_url('nilsding@nilsding.org')}
.media-body
%h4.entry-text.entry-about nilsding
%h6.entry-subtext Backend, Server & Code
.media
.pull-left
%a{href: show_user_profile_path('pixeldesu')}
%img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu@outlook.com')}
.media-body
%h4.entry-text.entry-about pixeldesu
%h6.entry-subtext Frontend Design & Layout
.panel.panel-default .panel.panel-default
.panel-body .panel-body
There are lies, damned lies, and then there are... There are lies, damned lies, and then there are...