Use tw style for some buttons. Improved deploy key UI
This commit is contained in:
parent
6e5cd8e081
commit
982a4095c1
8 changed files with 46 additions and 33 deletions
|
@ -1,8 +1,5 @@
|
||||||
.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 @@
|
||||||
|
|
||||||
&.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 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
&.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 @@
|
||||||
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 {
|
||||||
|
|
|
@ -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));
|
||||||
|
|
|
@ -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
|
||||||
.actions
|
= f.text_area :key, class: [:xxlarge, :thin_area]
|
||||||
= f.submit 'Save', class: "primary btn"
|
%p.hint
|
||||||
= link_to "Cancel", project_deploy_keys_path(@project), class: "btn"
|
Paste a machine public key here. Read more about how generate it
|
||||||
|
= link_to "here", help_ssh_path
|
||||||
|
|
||||||
|
.actions
|
||||||
|
= f.submit 'Save', class: "save-btn btn"
|
||||||
|
= link_to "Cancel", project_deploy_keys_path(@project), class: "btn cancel-btn"
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
= render "repositories/head"
|
= render "repositories/head"
|
||||||
|
|
||||||
|
%p.slead
|
||||||
|
Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
|
||||||
|
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
.alert-message.block-message
|
|
||||||
Deploy keys allow read-only access to repository.
|
|
||||||
= 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})
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
= render "repositories/head"
|
= render "repositories/head"
|
||||||
|
|
||||||
%h3 New Deploy key
|
%h3.page_title New Deploy key
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
= 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
|
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue