scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 14:41:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix hound

Browse source
This commit is contained in:
Mojca Lorber 2016-10-26 13:51:05 +02:00
parent 878952f072
commit 8309df0aaf
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/themes/scinote.scss
View file

@ -1455,26 +1455,26 @@ html.turbolinks-progress-bar::before {
} }
//edit avatar //edit avatar
#avatar-container { .avatar-container {
width: 100px;
height: 100px; height: 100px;
position: relative; position: relative;
width: 100px;
} }
#avatar-image, .avatar-image,
#avatar-edit { .avatar-edit {
width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
width: 100%;
} }
#avatar-edit { .avatar-edit {
z-index: 10;
opacity: 0.8;
margin-top: 70px; margin-top: 70px;
opacity: .8;
z-index: 10;
.btn-greyed { .btn-greyed {
border-radius: 0em; border-radius: 0;
width: 100px; width: 100px;
} }
} }

6
app/views/users/registrations/edit.html.erb
View file

@ -15,11 +15,11 @@
<div class="form-group"> <div class="form-group">
<%= f.label t("users.registrations.edit.avatar_label") %><br /> <%= f.label t("users.registrations.edit.avatar_label") %><br />
<% @user_avatar_url ||= avatar_path(current_user, :thumb) %> <% @user_avatar_url ||= avatar_path(current_user, :thumb) %>
<div id="avatar-container"> <div class="avatar-container">
<div id="avatar-image"> <div class="avatar-image">
<%= image_tag @user_avatar_url %> <%= image_tag @user_avatar_url %>
</div> </div>
<div id="avatar-edit"> <div class="avatar-edit">
<a href="#" class="btn btn-greyed btn-sm" data-action="edit"> <a href="#" class="btn btn-greyed btn-sm" data-action="edit">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
<%=t "users.registrations.edit.avatar_btn" %> <%=t "users.registrations.edit.avatar_btn" %>