Make issue and merge request sidebar more compact

* move votes block to participants
* make smaller font in sidebar

2 files changed, 7 insertions, 36 deletions

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d8d12338859..a640a4e2051 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -25,7 +25,7 @@
 }
 
 .issuable-context-title {
-  font-size: 15px;
+  font-size: 14px;
   line-height: 1.4;
   margin-bottom: 5px;
 
@@ -39,3 +39,9 @@
     margin-right: 4px;
   }
 }
+
+.issuable-affix .context {
+  font-size: 13px;
+
+  .btn { font-size: 13px; }
+}
diff --git a/app/assets/stylesheets/pages/votes.scss b/app/assets/stylesheets/pages/votes.scss
index ba0a519dca6..dc9a7d71e8b 100644
--- a/app/assets/stylesheets/pages/votes.scss
+++ b/app/assets/stylesheets/pages/votes.scss
@@ -1,39 +1,4 @@
-.votes {
-  font-size: 13px;
-  line-height: 15px;
-  .progress {
-    height: 4px;
-    margin: 0;
-    .bar {
-      float: left;
-      height: 100%;
-    }
-    .bar-success {
-      @include linear-gradient(#62C462, #51A351);
-      background-color: #468847;
-    }
-    .bar-danger {
-      @include linear-gradient(#EE5F5B, #BD362F);
-      background-color: #B94A48;
-    }
-  }
-  .upvotes {
-    display: inline-block;
-    color: #468847;
-  }
-  .downvotes {
-    display: inline-block;
-    color: #B94A48;
-  }
-}
-.votes-block {
-  margin: 6px;
-  .downvotes {
-    float: right;
-  }
-}
 .votes-inline {
   display: inline-block;
   margin: 0 8px;
 }
-