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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
573c89e6
Commit
573c89e6
authored
Oct 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Profile#account page UI
parent
1935b494
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
22 deletions
+40
-22
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+0
-20
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+38
-0
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/common.scss
View file @
573c89e6
...
@@ -270,26 +270,6 @@ li.note {
...
@@ -270,26 +270,6 @@ li.note {
}
}
}
}
.oauth_select_holder
{
img
{
padding
:
5px
;
margin-right
:
10px
;
}
.active
{
img
{
border
:
1px
solid
#ccc
;
background
:
$hover
;
@include
border-radius
(
5px
);
}
}
}
.btn-build-token
{
float
:
left
;
padding
:
6px
20px
;
margin-right
:
12px
;
}
.gitlab-promo
{
.gitlab-promo
{
a
{
a
{
color
:
#aaa
;
color
:
#aaa
;
...
...
app/assets/stylesheets/sections/profile.scss
View file @
573c89e6
...
@@ -4,3 +4,41 @@
...
@@ -4,3 +4,41 @@
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
}
}
.account-page
{
fieldset
{
margin-bottom
:
15px
;
border-bottom
:
1px
dashed
#ddd
;
padding-bottom
:
15px
;
&
:last-child
{
border
:
none
;
}
legend
{
border
:
none
;
margin
:
0
;
}
}
}
.oauth_select_holder
{
img
{
padding
:
2px
;
margin-right
:
10px
;
}
.active
{
img
{
border
:
1px
solid
#4BD
;
background
:
$hover
;
@include
border-radius
(
5px
);
}
}
}
.btn-build-token
{
float
:
left
;
padding
:
6px
20px
;
margin-right
:
12px
;
}
app/views/profiles/accounts/show.html.haml
View file @
573c89e6
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%hr
%hr
%div
.account-page
%fieldset
.update-token
%fieldset
.update-token
%legend
%legend
Private token
Private token
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
-
if
show_profile_social_tab?
-
if
show_profile_social_tab?
%fieldset
%fieldset
%legend
Social Accounts
%legend
Social Accounts
.oauth_select_holder
.oauth_select_holder
.append-bottom-10
%p
Click on icon to activate signin with one of the following services
%p
Click on icon to activate signin with one of the following services
-
enabled_social_providers
.
each
do
|
provider
|
-
enabled_social_providers
.
each
do
|
provider
|
%span
{
class:
oauth_active_class
(
provider
)
}
%span
{
class:
oauth_active_class
(
provider
)
}
...
...
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