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

Fix Bootstrap 3 regression: add email visibility icon to settings page

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-07 22:28:47 +02:00
parent 1c834d49d8
commit 6c32fa7845
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.pages.Settings = Backbone.View.extend({ app.pages.Settings = Backbone.View.extend({
initialize: function() { initialize: function() {
$(".settings_visibilty").tooltip({placement: "top"}); $(".settings_visibility").tooltip({placement: "top"});
} }
}); });
// @license-end // @license-end

2
app/assets/stylesheets/new_styles/_settings.scss
View file

@ -22,7 +22,7 @@
} }
} }
.settings_visibilty { margin-left: 10px; } .settings_visibility { margin-left: 10px; }
#profile_bio { #profile_bio {
width: 100%; width: 100%;

5
app/views/users/_edit.haml
View file

@ -17,7 +17,10 @@
%p %p
%b= current_user.diaspora_handle %b= current_user.diaspora_handle
.col-md-6 .col-md-6
%h3= t('.your_email') %h3
= t(".your_email")
%i.entypo.lock.gray.settings_visibility{title: t("users.edit.your_email_private")}
= form_for 'user', url: user_path, html: { method: :put, class: "form-horizontal col-md-12" , id: "email-form"} do |f| = form_for 'user', url: user_path, html: { method: :put, class: "form-horizontal col-md-12" , id: "email-form"} do |f|
= f.error_messages = f.error_messages