BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7216ce97
Commit
7216ce97
authored
Mar 17, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add modal dialog
parent
707be371
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
1 deletion
+40
-1
profile.scss
app/assets/stylesheets/pages/profile.scss
+17
-0
show.html.haml
app/views/profiles/show.html.haml
+23
-1
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
7216ce97
...
...
@@ -197,3 +197,20 @@
width
:
105px
;
}
}
.modal-profile-crop
{
.modal-dialog
{
width
:
380px
;
}
.profile-crop-image-container
{
width
:
350px
;
height
:
350px
;
margin
:
0
auto
;
}
.crop-controls
{
padding
:
10px
0
0
0
;
text-align
:
center
;
}
}
app/views/profiles/show.html.haml
View file @
7216ce97
...
...
@@ -26,7 +26,7 @@
%a
.btn.js-choose-user-avatar-button
Browse file...
%span
.avatar-file-name.prepend-left-default.js-avatar-filename
No file chosen
=
f
.
file_field
:avatar
,
class:
"js-user-avatar-input hidden
"
=
f
.
file_field
:avatar
_dialog_trigger
,
class:
"js-user-avatar-input hidden"
,
accept:
"image/*
"
.help-block
The maximum file size allowed is 200KB.
-
if
@user
.
avatar?
...
...
@@ -94,3 +94,25 @@
.prepend-top-default.append-bottom-default
=
f
.
submit
'Update profile settings'
,
class:
"btn btn-success"
=
link_to
"Cancel"
,
user_path
(
current_user
),
class:
"btn btn-cancel"
.modal.modal-profile-crop
.modal-dialog
.modal-content
.modal-header
%button
.close
{
:type
=>
"button"
,
:'data-dismiss'
=>
"modal"
}
%span
×
%h4
.modal-title
Position and size your new avatar
.modal-body
.profile-crop-image-container
%img
.modal-profile-crop-image
.crop-controls
.btn-group
%button
.btn.btn-primary
{
data:
{
method:
"zoom"
,
option:
"0.1"
}
}
%span
.fa.fa-search-plus
%button
.btn.btn-primary
{
data:
{
method:
"zoom"
,
option:
"-0.1"
}
}
%span
.fa.fa-search-minus
.modal-footer
%button
.btn.btn-primary.js-upload-user-avatar
{
:type
=>
"button"
}
Set new profile picture
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