new buttons for issue pagenew_colorsnew_buttons_issue

7 files changed, 20 insertions, 17 deletions

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index bc38a25c6c8..82567847d6b 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -5,7 +5,7 @@
   font-size: 15px;
   font-weight: 500;
   line-height: 18px;
-  padding: 7px $gl-padding;
+  padding: 11px $gl-padding;
   letter-spacing: .4px;
 
   &:focus,
@@ -71,7 +71,7 @@
   @include btn-white;
 
   &.btn-sm {
-    padding: 5px 10px;
+    padding: 7px 10px;
   }
 
   &.btn-xs {
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 5fd7c51a8be..0a838e04383 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -378,7 +378,9 @@ table {
   @include nav-menu;
   text-align: center;
   margin-top: 5px;
-  margin-top: -$gl-padding-top;
+  margin-bottom: $gl-padding;
+  height: auto;
+  margin-top: -$gl-padding;
 
   &.no-bottom {
     margin-bottom: 0;
@@ -390,8 +392,8 @@ table {
 
   li a {
     display: inline-block;
-    padding-top: 4px;
-    padding-bottom: 11px;
+    padding-top: $gl-padding;
+    padding-bottom: 16px;
     margin-bottom: -1px;
   }
 
@@ -436,6 +438,7 @@ table {
   }
 }
 
+
 .dropzone .dz-preview .dz-progress {
   border-color: $border-color !important;
 }
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss
index ee36935dcf5..81f4e9c1057 100644
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -4,9 +4,9 @@
  *
  */
 
-.issue-box {
-  @include border-radius(3px);
 
+.status-box {
+  @include border-radius(3px);
   display: block;
   float: left;
   padding: 0 $gl-padding;
@@ -23,8 +23,8 @@
     background-color: $gl-primary;
     color: #FFF;
   }
-  
-  &.issue-box-open {
+
+  &.status-box-open {
     background-color: #31af64;
     color: #FFF;
   }
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 0f3463a9144..deab805dbc2 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -5,7 +5,7 @@
   border-bottom: 1px solid $border-color;
   color: #5c5d5e;
   font-size: 16px;
-  line-height: 42px;
+  line-height: 34px;
 
   .author {
     color: #5c5d5e;
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 64e1912685b..f96a5bd30e6 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,9 +1,9 @@
 - content_for :note_actions do
   - if can?(current_user, :update_issue, @issue)
     - 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
-      = 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
   = render 'projects/notes/notes_with_form'
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 2fe6f88b2a9..c750d0fa2cf 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -23,16 +23,16 @@
 
     .pull-right
       - 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')
           New Issue
       - if can?(current_user, :update_issue, @issue)
         - 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
-          = 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')
           Edit
 
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index a089664e1ae..99e05ef3051 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -13,6 +13,6 @@
     .error-alert
 
   .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)
     %a.btn.btn-cancel.warning.js-close-discussion-note-form Cancel