Clean up CSS; fix specsPOC-right-sidebar-updates

3 files changed, 14 insertions, 15 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 8fb4027bf97..3d3dfd78365 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -767,6 +767,7 @@
   .pika-lendar {
     margin-top: -5px;
     margin-bottom: 0;
+    width: 222px;
   }
 }
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 09933660b8f..43d0e51e4c9 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -88,7 +88,6 @@
 
 .right-sidebar {
   border-left: 1px solid $border-color;
-  // font-size: $gl-font-size-small;
 }
 
 .with-performance-bar .right-sidebar.affix {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index a10f1277f59..472b113ee20 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -147,21 +147,20 @@
   }
 
   .issuable-header-text {
-    margin-top: 7px;
+    margin-top: 4px;
   }
 
   .block {
     @include clearfix;
     padding: $gl-padding 0;
-    border-bottom: 1px solid $border-gray-normal;
+    border-bottom: 1px solid $gray-100;
     // This prevents the mess when resizing the sidebar
     // of elements repositioning themselves..
     width: $gutter-inner-width;
     // --
 
-    &.issuable-sidebar-header {
-      padding-top: 0;
-      padding-bottom: 10px;
+    &.block-small {
+      padding: 10px 0;
     }
 
     &:last-child {
@@ -205,6 +204,10 @@
         }
       }
     }
+
+    .toggle-wrapper {
+      margin: 2px 0;
+    }
   }
 
   .block-first {
@@ -225,9 +228,11 @@
     }
 
     .lock-edit, // uses same style, different js behaviour
-    .edit-link {
+    .edit-link,
+    confidential-edit {
       @extend .btn-blank;
       color: $gl-text-color;
+      font-size: $gl-font-size-small;
 
       &:hover {
         text-decoration: underline;
@@ -243,7 +248,6 @@
       white-space: nowrap;
       width: 85%;
       overflow: hidden;
-      position: relative;
       display: inline-block;
       text-overflow: ellipsis;
     }
@@ -254,8 +258,7 @@
 
     button {
       float: right;
-      padding: 1px 5px;
-      background-color: $gray-light;
+      padding: 4px 5px 0;
     }
   }
 
@@ -299,10 +302,6 @@
       padding: 0 20px;
     }
 
-    .issuable-sidebar-header {
-      padding-top: 10px;
-    }
-
     &:not(.issue-boards-sidebar):not([data-signed-in]):not([data-always-show-toggle]) {
       .issuable-sidebar-header {
         display: none;
@@ -332,7 +331,7 @@
     }
 
     .gutter-toggle {
-      margin-top: 7px;
+      margin-top: 4px;
       border-left: 1px solid $border-gray-normal;
       text-align: center;
     }