From c285a947e3d7d7e31e9af8b035acae9351cbeafa Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 29 Apr 2019 12:19:14 -0500
Subject: Clean up CSS; fix specs

---
 .../boards/components/sidebar/remove_issue.vue     |  2 +-
 .../subscriptions/sidebar_subscriptions.vue        |  2 +-
 .../components/time_tracking/help_state.vue        |  2 +-
 app/assets/stylesheets/framework/dropdowns.scss    |  1 +
 app/assets/stylesheets/framework/sidebar.scss      |  1 -
 app/assets/stylesheets/pages/issuable.scss         | 27 +++++++++++-----------
 .../components/sidebar/_notifications.html.haml    |  2 +-
 app/views/shared/issuable/_sidebar.html.haml       |  2 +-
 locale/gitlab.pot                                  |  3 ---
 spec/support/helpers/board_helpers.rb              |  2 +-
 10 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/boards/components/sidebar/remove_issue.vue b/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
index a2b8a0af236..fd12e25a3bc 100644
--- a/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
+++ b/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
@@ -75,7 +75,7 @@ export default Vue.extend({
 </script>
 <template>
   <div class="block list">
-    <button class="btn btn-default btn-block" type="button" @click="removeIssue">
+    <button class="btn btn-sm btn-block" type="button" @click="removeIssue">
       Remove from board
     </button>
   </div>
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
index 95a2c8cce6e..952fd1908f9 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
@@ -30,7 +30,7 @@ export default {
 </script>
 
 <template>
-  <div class="block subscriptions">
+  <div class="block subscriptions block-small">
     <subscriptions
       :loading="store.isFetching.subscriptions"
       :subscribed="store.subscribed"
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
index 51cd5810ac0..a1ee1cc532f 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
@@ -44,7 +44,7 @@ export default {
       <p>{{ __('Quick actions can be used in the issues description and comment boxes.') }}</p>
       <p v-html="estimateText"></p>
       <p v-html="spendText"></p>
-      <a :href="href" class="btn btn-default learn-more-button"> {{ __('Learn more') }} </a>
+      <a :href="href" class="btn btn-sm learn-more-button"> {{ __('Learn more') }} </a>
     </div>
   </div>
 </template>
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;
     }
diff --git a/app/views/shared/boards/components/sidebar/_notifications.html.haml b/app/views/shared/boards/components/sidebar/_notifications.html.haml
index 333dd1a00b4..8667659a0f2 100644
--- a/app/views/shared/boards/components/sidebar/_notifications.html.haml
+++ b/app/views/shared/boards/components/sidebar/_notifications.html.haml
@@ -1,5 +1,5 @@
 - if current_user
-  .block.subscriptions
+  .block.subscriptions.block-small
     %subscriptions{ ":loading" => "issue.isFetching && issue.isFetching.subscriptions",
       ":subscribed" => "issue.subscribed",
       ":id" => "issue.id" }
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index dedfb154a79..0a563e10c42 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -7,7 +7,7 @@
 
 %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { signed: { in: signed_in } }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
   .issuable-sidebar
-    .block.issuable-sidebar-header
+    .block.issuable-sidebar-header.block-small
       - if signed_in
         %span.issuable-header-text.hide-collapsed.float-left
           = _('Todo')
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5bc9bb3434d..8168627de19 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7390,9 +7390,6 @@ msgstr ""
 msgid "Recent searches"
 msgstr ""
 
-msgid "Reference:"
-msgstr ""
-
 msgid "Refreshing in a second to show the updated status..."
 msgid_plural "Refreshing in %d seconds to show the updated status..."
 msgstr[0] ""
diff --git a/spec/support/helpers/board_helpers.rb b/spec/support/helpers/board_helpers.rb
index b85fde222ea..55654a11c4e 100644
--- a/spec/support/helpers/board_helpers.rb
+++ b/spec/support/helpers/board_helpers.rb
@@ -10,7 +10,7 @@ module BoardHelpers
   def wait_for_sidebar
     # loop until the CSS transition is complete
     Timeout.timeout(0.5) do
-      loop until evaluate_script('$(".right-sidebar").outerWidth()') == 290
+      loop until evaluate_script('$(".right-sidebar").outerWidth()') == 272
     end
   end
 end
-- 
cgit v1.2.1