From 8beb7c886e3bb9706bfa6760325453e749b84231 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 31 May 2014 14:21:13 +0300 Subject: [PATCH] Different UI colors for archive project and remove project --- app/assets/stylesheets/generic/buttons.scss | 16 ++++++++++++++++ app/views/projects/edit.html.haml | 42 +++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss index dd0a293..1c74bd2 100644 --- a/app/assets/stylesheets/generic/buttons.scss +++ b/app/assets/stylesheets/generic/buttons.scss @@ -104,6 +104,22 @@ } } + &.btn-warning { + color: #ffffff; + background-color: $bg_warning; + border-color: $border_warning; + + + &.hover, + &:hover, + &.disabled, + &[disabled] { + color: #ffffff; + background-color: #e38c02; + border-color: #e38c02; + } + } + &.btn-new { @extend .btn-success; } diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 4377502..59dcf3a 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -106,7 +106,7 @@ .js-toggle-content.hide - if can? current_user, :archive_project, @project - .panel.panel-default.panel.panel-danger + .panel.panel-default.panel.panel-warning .panel-heading - if @project.archived? Unarchive project @@ -132,10 +132,29 @@ %strong Archived projects cannot be committed to! = link_to 'Archive', archive_project_path(@project), data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." }, - method: :post, class: "btn btn-remove" + method: :post, class: "btn btn-warning" - else .nothing-here-block Only the project owner can archive a project + .panel.panel-default.panel.panel-warning + .panel-heading Rename repository + .errors-holder + .panel-body + = form_for(@project, html: { class: 'form-horizontal' }) do |f| + .form-group + = f.label :path, class: 'control-label' do + %span Path + .col-sm-9 + .form-group + .input-group + = f.text_field :path, class: 'form-control' + %span.input-group-addon .git + %ul + %li Be careful. Renaming a project's repository can have unintended side effects. + %li You will need to update your local repositories to point to the new location. + .form-actions + = f.submit 'Rename', class: "btn btn-warning" + - if can?(current_user, :change_namespace, @project) .panel.panel-default.panel.panel-danger .panel-heading Transfer project @@ -157,25 +176,6 @@ - else .nothing-here-block Only the project owner can transfer a project - .panel.panel-default.panel.panel-danger - .panel-heading Rename repository - .errors-holder - .panel-body - = form_for(@project, html: { class: 'form-horizontal' }) do |f| - .form-group - = f.label :path, class: 'control-label' do - %span Path - .col-sm-9 - .form-group - .input-group - = f.text_field :path, class: 'form-control' - %span.input-group-addon .git - %ul - %li Be careful. Renaming a project's repository can have unintended side effects. - %li You will need to update your local repositories to point to the new location. - .form-actions - = f.submit 'Rename', class: "btn btn-remove" - - if can?(current_user, :remove_project, @project) .panel.panel-default.panel.panel-danger .panel-heading Remove project -- libgit2 0.21.2