Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6b394a80
Commit
6b394a80
authored
Mar 25, 2019
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regressions post bootstrap_form upgrade
parent
9ea2c959
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+9
-0
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
6b394a80
...
@@ -438,8 +438,17 @@ table.u2f-registrations {
...
@@ -438,8 +438,17 @@ table.u2f-registrations {
}
}
}
}
.form-group
>
label
{
font-weight
:
$gl-font-weight-bold
;
}
.form-group
>
.form-text
{
font-size
:
$gl-font-size
;
}
.emoji-menu-toggle-button
{
.emoji-menu-toggle-button
{
@include
emoji-menu-toggle-button
;
@include
emoji-menu-toggle-button
;
padding
:
6px
10px
;
.no-emoji-placeholder
{
.no-emoji-placeholder
{
position
:
relative
;
position
:
relative
;
...
...
app/views/profiles/show.html.haml
View file @
6b394a80
...
@@ -99,10 +99,10 @@
...
@@ -99,10 +99,10 @@
.checkbox-icon-inline-wrapper
.checkbox-icon-inline-wrapper
-
private_profile_label
=
capture
do
-
private_profile_label
=
capture
do
=
s_
(
"Profiles|Don't display activity-related personal information on your profiles"
)
=
s_
(
"Profiles|Don't display activity-related personal information on your profiles"
)
=
f
.
check_box
:private_profile
,
label:
private_profile_label
=
f
.
check_box
:private_profile
,
label:
private_profile_label
,
inline:
true
,
wrapper_class:
'mr-0'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/profile/index.md'
,
anchor:
'private-profile'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/profile/index.md'
,
anchor:
'private-profile'
)
%h5
=
s_
(
"Profiles|Private contributions"
)
%h5
=
s_
(
"Profiles|Private contributions"
)
=
f
.
check_box
:include_private_contributions
,
label:
'Include private contributions on my profile'
=
f
.
check_box
:include_private_contributions
,
label:
'Include private contributions on my profile'
,
wrapper_class:
'mb-2'
,
inline:
true
.help-block
.help-block
=
s_
(
"Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information"
)
=
s_
(
"Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information"
)
.prepend-top-default.append-bottom-default
.prepend-top-default.append-bottom-default
...
...
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