Skip to content
Snippets Groups Projects
Commit 369e5a7f authored by Andriy Dyadyura's avatar Andriy Dyadyura
Browse files

new buttons for issue page

parent c930a8a4
No related branches found
No related tags found
No related merge requests found
Loading
@@ -5,7 +5,7 @@
Loading
@@ -5,7 +5,7 @@
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
line-height: 18px; line-height: 18px;
padding: 7px $gl-padding; padding: 11px $gl-padding;
letter-spacing: .4px; letter-spacing: .4px;
   
&:focus, &:focus,
Loading
@@ -71,7 +71,7 @@
Loading
@@ -71,7 +71,7 @@
@include btn-white; @include btn-white;
   
&.btn-sm { &.btn-sm {
padding: 5px 10px; padding: 7px 10px;
} }
   
&.btn-xs { &.btn-xs {
Loading
Loading
Loading
@@ -378,7 +378,9 @@ table {
Loading
@@ -378,7 +378,9 @@ table {
@include nav-menu; @include nav-menu;
text-align: center; text-align: center;
margin-top: 5px; margin-top: 5px;
margin-top: -$gl-padding-top; margin-bottom: $gl-padding;
height: auto;
margin-top: -$gl-padding;
   
&.no-bottom { &.no-bottom {
margin-bottom: 0; margin-bottom: 0;
Loading
@@ -390,8 +392,8 @@ table {
Loading
@@ -390,8 +392,8 @@ table {
   
li a { li a {
display: inline-block; display: inline-block;
padding-top: 4px; padding-top: $gl-padding;
padding-bottom: 11px; padding-bottom: 16px;
margin-bottom: -1px; margin-bottom: -1px;
} }
   
Loading
@@ -436,6 +438,7 @@ table {
Loading
@@ -436,6 +438,7 @@ table {
} }
} }
   
.dropzone .dz-preview .dz-progress { .dropzone .dz-preview .dz-progress {
border-color: $border-color !important; border-color: $border-color !important;
} }
Loading
Loading
Loading
@@ -4,9 +4,9 @@
Loading
@@ -4,9 +4,9 @@
* *
*/ */
   
.issue-box {
@include border-radius(3px);
   
.status-box {
@include border-radius(3px);
display: block; display: block;
float: left; float: left;
padding: 0 $gl-padding; padding: 0 $gl-padding;
Loading
@@ -23,8 +23,8 @@
Loading
@@ -23,8 +23,8 @@
background-color: $gl-primary; background-color: $gl-primary;
color: #FFF; color: #FFF;
} }
&.issue-box-open { &.status-box-open {
background-color: #31af64; background-color: #31af64;
color: #FFF; color: #FFF;
} }
Loading
Loading
Loading
@@ -5,7 +5,7 @@
Loading
@@ -5,7 +5,7 @@
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
color: #5c5d5e; color: #5c5d5e;
font-size: 16px; font-size: 16px;
line-height: 42px; line-height: 34px;
   
.author { .author {
color: #5c5d5e; color: #5c5d5e;
Loading
Loading
- content_for :note_actions do - content_for :note_actions do
- if can?(current_user, :update_issue, @issue) - if can?(current_user, :update_issue, @issue)
- if @issue.closed? - if @issue.closed?
= link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-success btn-reopen js-note-target-reopen', title: 'Reopen Issue' = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-sm btn-success btn-reopen js-note-target-reopen', title: 'Reopen Issue'
- else - else
= link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-warning js-note-target-close', title: 'Close Issue' = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-sm btn-warning js-note-target-close', title: 'Close Issue'
   
#notes #notes
= render 'projects/notes/notes_with_form' = render 'projects/notes/notes_with_form'
Loading
@@ -23,16 +23,16 @@
Loading
@@ -23,16 +23,16 @@
   
.pull-right .pull-right
- if can?(current_user, :create_issue, @project) - if can?(current_user, :create_issue, @project)
= link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'btn btn-grouped new-issue-link', title: 'New Issue', id: 'new_issue_link' do = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'btn btn-sm btn-grouped btn-success', title: 'New Issue', id: 'new_issue_link' do
= icon('plus') = icon('plus')
New Issue New Issue
- if can?(current_user, :update_issue, @issue) - if can?(current_user, :update_issue, @issue)
- if @issue.closed? - if @issue.closed?
= link_to 'Reopen', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-grouped btn-reopen' = link_to 'Reopen', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-sm btn-grouped btn-success'
- else - else
= link_to 'Close', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-grouped btn-close', title: 'Close Issue' = link_to 'Close', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-sm btn-grouped btn-warning', title: 'Close Issue'
   
= link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'btn btn-grouped issuable-edit' do = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'btn btn-sm btn-grouped btn-default' do
= icon('pencil-square-o') = icon('pencil-square-o')
Edit Edit
   
Loading
Loading
Loading
@@ -13,6 +13,6 @@
Loading
@@ -13,6 +13,6 @@
.error-alert .error-alert
   
.note-form-actions.clearfix .note-form-actions.clearfix
= f.submit 'Add Comment', class: "btn btn-create comment-btn btn-grouped js-comment-button" = f.submit 'Add Comment', class: "btn btn-sm btn-create comment-btn btn-grouped js-comment-button"
= yield(:note_actions) = yield(:note_actions)
%a.btn.btn-cancel.warning.js-close-discussion-note-form Cancel %a.btn.btn-cancel.warning.js-close-discussion-note-form Cancel
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment