Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
295c8533
Commit
295c8533
authored
Jul 17, 2015
by
Steffen van Bergerem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix profile visibility icon
parent
0e439f6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/app/pages/settings.js
app/assets/javascripts/app/pages/settings.js
+1
-0
app/assets/stylesheets/profile.scss
app/assets/stylesheets/profile.scss
+2
-3
app/views/profiles/_edit_private.haml
app/views/profiles/_edit_private.haml
+2
-2
No files found.
app/assets/javascripts/app/pages/settings.js
View file @
295c8533
...
...
@@ -2,6 +2,7 @@
app
.
pages
.
Settings
=
Backbone
.
View
.
extend
({
initialize
:
function
()
{
$
(
"
.settings_visibility
"
).
tooltip
({
placement
:
"
top
"
});
$
(
"
.profile-visibility-hint
"
).
tooltip
({
placement
:
"
top
"
});
$
(
"
[name='profile[public_details]']
"
).
bootstrapSwitch
();
}
});
...
...
app/assets/stylesheets/profile.scss
View file @
295c8533
...
...
@@ -150,7 +150,6 @@
}
#update_profile_form
{
.visibility-hint-icon
{
cursor
:
pointer
;
}
.profile-visibility-hint
{
margin-left
:
10px
;
}
.visibility-hint-icon
{
cursor
:
default
;
}
}
app/views/profiles/_edit_private.haml
View file @
295c8533
...
...
@@ -7,8 +7,8 @@
=
t
(
"profiles.edit.extended"
)
=
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"
)}
%span
{
:title
=>
t
(
"profiles.edit.extended_hint"
)
}
%i
.entypo
.
circled-help.visibility-hint-icon
%span
.profile-visibility-hint
{
title:
t
(
"profiles.edit.extended_hint"
)
}
%i
.entypo
-
circled-help.visibility-hint-icon
.small-horizontal-spacer
%h4
=
t
(
'profiles.edit.your_bio'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment