nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6204 from svbergerem/fix-profile-visibility-icon

Browse source 
Fix profile visibility icon
This commit is contained in:
Jonne Haß 2015-07-17 15:39:49 +02:00
commit 00fc14e265
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/pages/settings.js
View file

@ -2,6 +2,7 @@
app.pages.Settings = Backbone.View.extend({ app.pages.Settings = Backbone.View.extend({
initialize: function() { initialize: function() {
$(".settings_visibility").tooltip({placement: "top"}); $(".settings_visibility").tooltip({placement: "top"});
$(".profile-visibility-hint").tooltip({placement: "top"});
$("[name='profile[public_details]']").bootstrapSwitch(); $("[name='profile[public_details]']").bootstrapSwitch();
} }
}); });

5
app/assets/stylesheets/profile.scss
View file

@ -150,7 +150,6 @@
} }
#update_profile_form { #update_profile_form {
.visibility-hint-icon { .profile-visibility-hint { margin-left: 10px; }
cursor: pointer; .visibility-hint-icon { cursor: default; }
}
} }

4
app/views/profiles/_edit_private.haml
View file

@ -7,8 +7,8 @@
= t("profiles.edit.extended") = t("profiles.edit.extended")
= t("profiles.edit.extended_visibility_text") = t("profiles.edit.extended_visibility_text")
= check_box_tag "profile[public_details]", true, profile.public_details, {"data-size" => "mini", "data-on-text" => t("profiles.edit.public"), "data-off-text" => t("profiles.edit.limited")} = check_box_tag "profile[public_details]", true, profile.public_details, {"data-size" => "mini", "data-on-text" => t("profiles.edit.public"), "data-off-text" => t("profiles.edit.limited")}
%span{ :title => t("profiles.edit.extended_hint") } %span.profile-visibility-hint{ title: t("profiles.edit.extended_hint") }
%i.entypo.circled-help.visibility-hint-icon %i.entypo-circled-help.visibility-hint-icon
.small-horizontal-spacer .small-horizontal-spacer
%h4= t('profiles.edit.your_bio') %h4= t('profiles.edit.your_bio')