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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
982a4095
Commit
982a4095
authored
Sep 05, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use tw style for some buttons. Improved deploy key UI
parent
6e5cd8e0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
45 additions
and
32 deletions
+45
-32
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+7
-19
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+7
-0
app/views/deploy_keys/_form.html.haml
app/views/deploy_keys/_form.html.haml
+8
-3
app/views/deploy_keys/index.html.haml
app/views/deploy_keys/index.html.haml
+10
-4
app/views/deploy_keys/new.html.haml
app/views/deploy_keys/new.html.haml
+1
-1
app/views/deploy_keys/show.html.haml
app/views/deploy_keys/show.html.haml
+10
-3
app/views/keys/show.html.haml
app/views/keys/show.html.haml
+1
-1
app/views/team_members/show.html.haml
app/views/team_members/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file @
982a4095
.btn
{
.btn
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
26
,
color-stop
(
0
.076
,
#f7f7f7
)
,
to
(
#d5d5d5
));
@include
bg-gradient
(
#f7f7f7
,
#d5d5d5
);
background-image
:
-webkit-linear-gradient
(
#f7f7f7
7
.6%
,
#d5d5d5
);
background-image
:
-moz-linear-gradient
(
#f7f7f7
7
.6%
,
#d5d5d5
);
background-image
:
-o-linear-gradient
(
#f7f7f7
7
.6%
,
#d5d5d5
);
border-color
:
#aaa
;
border-color
:
#aaa
;
&
:hover
{
&
:hover
{
@include
bg-gray-gradient
;
@include
bg-gray-gradient
;
...
@@ -12,10 +9,8 @@
...
@@ -12,10 +9,8 @@
&
.primary
{
&
.primary
{
background
:
#2a79A3
;
background
:
#2a79A3
;
@include
bg-gradient
(
#47A7b7
,
#2585b5
);
border-color
:
#2A79A3
;
border-color
:
#2A79A3
;
background-image
:
-webkit-linear-gradient
(
#47A7b7
7
.6%
,
#2585b5
);
background-image
:
-moz-linear-gradient
(
#47A7b7
7
.6%
,
#2585b5
);
background-image
:
-o-linear-gradient
(
#47A7b7
7
.6%
,
#2585b5
);
color
:
#fff
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#268
;
text-shadow
:
0
1px
1px
#268
;
&
:hover
{
&
:hover
{
...
@@ -30,16 +25,11 @@
...
@@ -30,16 +25,11 @@
}
}
&
.success
{
&
.success
{
border-color
:
#4A4
;
@extend
.btn-success
;
background-image
:
-webkit-linear-gradient
(
#82D482
7
.6%
,
#22B442
);
background-image
:
-moz-linear-gradient
(
#82D482
7
.6%
,
#22B442
);
background-image
:
-o-linear-gradient
(
#82D482
7
.6%
,
#22B442
);
color
:
#fff
;
text-shadow
:
0
1px
1px
#141
;
&
:hover
{
&
:hover
{
background
:
#6C6
;
@extend
.btn-success
;
color
:
#fff
;
background
:
#51a351
;
}
}
&
.disabled
{
&
.disabled
{
...
@@ -62,10 +52,8 @@
...
@@ -62,10 +52,8 @@
padding-right
:
30px
;
padding-right
:
30px
;
}
}
&
.danger
,
&
.danger
{
&
.btn-danger
{
@extend
.btn-danger
;
color
:
#fff
;
background
:
#DA4E49
;
border-color
:
#BD362F
;
border-color
:
#BD362F
;
&
:hover
{
&
:hover
{
...
...
app/assets/stylesheets/main.scss
View file @
982a4095
...
@@ -56,6 +56,13 @@ $hover: #fdf5d9;
...
@@ -56,6 +56,13 @@ $hover: #fdf5d9;
border-radius
:
$radius
;
border-radius
:
$radius
;
}
}
@mixin
bg-gradient
(
$from
,
$to
)
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
$from
)
,
to
(
$to
));
background-image
:
-webkit-linear-gradient
(
$from
,
$to
);
background-image
:
-moz-linear-gradient
(
$from
,
$to
);
background-image
:
-o-linear-gradient
(
$from
,
$to
);
}
@mixin
bg-gray-gradient
{
@mixin
bg-gray-gradient
{
background
:
#eee
;
background
:
#eee
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#eee
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#eee
)
,
to
(
#dfdfdf
));
...
...
app/views/deploy_keys/_form.html.haml
View file @
982a4095
...
@@ -11,8 +11,13 @@
...
@@ -11,8 +11,13 @@
.input
=
f
.
text_field
:title
.input
=
f
.
text_field
:title
.clearfix
.clearfix
=
f
.
label
:key
=
f
.
label
:key
.input
=
f
.
text_area
:key
,
class:
"xlarge"
.input
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
%p
.hint
Paste a machine public key here. Read more about how generate it
=
link_to
"here"
,
help_ssh_path
.actions
.actions
=
f
.
submit
'Save'
,
class:
"
primary
btn"
=
f
.
submit
'Save'
,
class:
"
save-btn
btn"
=
link_to
"Cancel"
,
project_deploy_keys_path
(
@project
),
class:
"btn"
=
link_to
"Cancel"
,
project_deploy_keys_path
(
@project
),
class:
"btn
cancel-btn
"
app/views/deploy_keys/index.html.haml
View file @
982a4095
=
render
"repositories/head"
=
render
"repositories/head"
-
if
can?
current_user
,
:admin_project
,
@project
.alert-message.block-message
%p
.slead
Deploy keys allow read-only access to repository.
Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
-
if
can?
current_user
,
:admin_project
,
@project
=
link_to
new_project_deploy_key_path
(
@project
),
class:
"btn small"
,
title:
"New Deploy Key"
do
=
link_to
new_project_deploy_key_path
(
@project
),
class:
"btn small"
,
title:
"New Deploy Key"
do
Add Deploy Key
Add Deploy Key
-
if
@keys
.
any?
-
if
@keys
.
any?
%table
%table
%thead
%tr
%th
Keys
%th
%th
-
@keys
.
each
do
|
key
|
-
@keys
.
each
do
|
key
|
=
render
(
partial:
'show'
,
locals:
{
key:
key
})
=
render
(
partial:
'show'
,
locals:
{
key:
key
})
app/views/deploy_keys/new.html.haml
View file @
982a4095
=
render
"repositories/head"
=
render
"repositories/head"
%h3
New Deploy key
%h3
.page_title
New Deploy key
%hr
%hr
=
render
'form'
=
render
'form'
app/views/deploy_keys/show.html.haml
View file @
982a4095
=
render
"repositories/head"
=
render
"repositories/head"
%h3
=
@key
.
title
%h3
.page_title
Deploy key:
=
@key
.
title
%small
created at
=
@key
.
created_at
.
stamp
(
"Aug 21, 2011"
)
.back_link
=
link_to
project_deploy_keys_path
(
@project
)
do
←
To keys list
%hr
%hr
%pre
=
@key
.
key
%pre
=
@key
.
key
.
actions
.
right
=
link_to
'Remove'
,
project_deploy_key_path
(
@key
.
project
,
@key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"danger btn delete-key"
=
link_to
'Remove'
,
project_deploy_key_path
(
@key
.
project
,
@key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"danger btn delete-key"
.clear
app/views/keys/show.html.haml
View file @
982a4095
...
@@ -10,5 +10,5 @@
...
@@ -10,5 +10,5 @@
%hr
%hr
%pre
=
@key
.
key
%pre
=
@key
.
key
.
actions
.
right
=
link_to
'Remove'
,
@key
,
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn danger delete-key"
=
link_to
'Remove'
,
@key
,
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn danger delete-key"
app/views/team_members/show.html.haml
View file @
982a4095
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.team_member_show
.team_member_show
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
=
link_to
'Remove from team'
,
project_team_member_path
(
project_id:
@project
,
id:
@team_member
.
id
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"right btn
btn-
danger"
=
link_to
'Remove from team'
,
project_team_member_path
(
project_id:
@project
,
id:
@team_member
.
id
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"right btn danger"
.profile_avatar_holder
.profile_avatar_holder
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
class:
"borders"
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
class:
"borders"
%h3
%h3
...
...
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