Different UI colors for archive project and remove project

Since remove is more danger in compare to archive it good to have them in different colors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Different UI colors for archive project and remove project
Since remove is more danger in compare to archive it good to have them in different colors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent c2c43e6a
Showing 2 changed files with 37 additions and 21 deletions Show diff stats
app/assets/stylesheets/generic/buttons.scss
app/views/projects/edit.html.haml
@@ -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;
   }
@@ -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
	@@ -104,6 +104,22 @@		@@ -104,6 +104,22 @@
104	}	104	}
105	}	105	}
106		106
		107	+ &.btn-warning {
		108	+ color: #ffffff;
		109	+ background-color: $bg_warning;
		110	+ border-color: $border_warning;
		111	+
		112	+
		113	+ &.hover,
		114	+ &:hover,
		115	+ &.disabled,
		116	+ &[disabled] {
		117	+ color: #ffffff;
		118	+ background-color: #e38c02;
		119	+ border-color: #e38c02;
		120	+ }
		121	+ }
		122	+
107	&.btn-new {	123	&.btn-new {
108	@extend .btn-success;	124	@extend .btn-success;
109	}	125	}