From 6bf1c6bb01a2cf77e53a34c30843475002742086 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 3 Jan 2015 03:52:23 +0100 Subject: [PATCH 1/3] changed background color --- app/assets/stylesheets/base.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index 6df8d7dc..7bfb841a 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -3,6 +3,7 @@ body { overflow-y: scroll; word-wrap: break-word; + background-color: #e3e3e3; } @import "scss/answerbox"; From 1c7b064dbd37f08a74e3666728ef2782befe504b Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 3 Jan 2015 03:54:30 +0100 Subject: [PATCH 2/3] removed this shit --- app/assets/stylesheets/scss/user.scss | 39 -------------------------- app/views/user/_profile_info.html.haml | 8 ++---- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 054f8a11..404e7b67 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/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; } \ No newline at end of file diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index 1e7e8406..236687ce 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -1,10 +1,5 @@ .panel.panel-default - .profile--avatar - .dimmer - .content - .center - = render 'user/actions', user: @user, type: :follower - %img{src: @user.profile_picture.url(:large)} + %img.profile--avatar{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 \ No newline at end of file From 639fa43a5a3de9221318c32e77d45b1541f00cd1 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 3 Jan 2015 03:56:14 +0100 Subject: [PATCH 3/3] fix indentation --- app/views/user/_profile_info.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index 236687ce..8fdb59b5 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -47,5 +47,5 @@ %p.profile--text %i.fa.fa-location-arrow = @user.location - = render 'user/actions', user: @user, type: :follower + = render 'user/actions', user: @user, type: :follower = render 'user/stats', user: @user \ No newline at end of file