Merge branch 'master' of 10.2.0.1:justask/justask

app/assets/stylesheets/base.css.scss

@@ -3,6 +3,7 @@
 body {
   overflow-y: scroll;
   word-wrap: break-word;
+  background-color: #e3e3e3;
 }
 
 @import "scss/answerbox";

app/assets/stylesheets/scss/user.scss

@@ -87,48 +87,9 @@
 }
 
 .profile--avatar {
-  width: 100%;
-  height: auto;
-}
-
-.profile--avatar img {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
   width: 100%;
   height: auto;
   border: medium none;
 }
-
-.profile--avatar .dimmer {
-  position: absolute;
-  top: 0px !important;
-  left: 0px !important;
-  width: 100%;
-  height: 100%;
-  display: block;
-  min-height: 0px;
-  background: none repeat scroll 0% 0% #FFF;
-  padding: 0px;
-  border: medium none;
-  border-radius: 0.2857rem;
-  box-shadow: 0px 0.2em 0px 0px #D4D4D5, 0px 0px 0px 1px #D4D4D5;
-  transition: box-shadow 0.2s ease 0s;
-  opacity: 0;
-}
-
-.profile--avatar .dimmer:hover {
-  opacity: 1;
-}
-
-.profile--avatar .dimmer .content {
-  width: 100%;
-  height: 100%;
-  display: table;
-  -moz-user-select: text;
-}
-
-.profile--avatar .dimmer .content .center {
-  display: table-cell;
-  vertical-align: middle;
-  padding: 20px;
-}

app/views/user/_profile_info.html.haml

@@ -1,10 +1,5 @@
 .panel.panel-default
-  .profile--avatar
+  %img.profile--avatar{src: @user.profile_picture.url(:large)}
-    .dimmer
-      .content
-        .center
-          = render 'user/actions', user: @user, type: :follower
-    %img{src: @user.profile_picture.url(:large)}
   .panel-body
     - if @user.display_name.blank?
       .profile--displayname
@@ -52,4 +47,5 @@
       %p.profile--text
         %i.fa.fa-location-arrow
         = @user.location
+    = render 'user/actions', user: @user, type: :follower
 = render 'user/stats', user: @user