Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'

Sidebar fixes Fixes #13215 * when editing a dropdown, but not changing anything you end up in an ugly state * the hover-over state for the subscribe and other buttons are veeery subtle * the collapse button needs some sort of hover-over state * the reference gets shortened. It always got shortened. Not an issue with this in particular. * the minimized sidebar is not functional. The copy button doesn't do anything * looks all funky in safari (not for me) See merge request !2736

Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'
7cc4b739 · Jacob Schatz · bbbfdba0 · 306c50ce · 7cc4b739 · 7cc4b739
Commit 7cc4b739 authored Feb 16, 2016 by Jacob Schatz
Show whitespace changes
Inline Side-by-side

Showing with 26 additions and 1 deletion

issuable.scss app/assets/stylesheets/pages/issuable.scss +25 -0

_sidebar.html.haml app/views/shared/issuable/_sidebar.html.haml +1 -1

No files found.
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -80,6 +80,10 @@
      display: inline-block;
    }

+    .select2-container span {
+      margin-top: 0;
+    }
+
    .issuable-count {

    }
@@ -88,6 +92,10 @@
      margin-left: 20px;
      border-left: 1px solid $border-gray-light;
      padding-left: 10px;
+
+      &:hover {
+        color: $gray-darkest;
+      }
    }
  }

@@ -192,6 +200,10 @@
  .btn {
    background: $gray-normal;
    border: 1px solid $border-gray-normal;
+    &:hover {
+      background: $gray-dark;
+      border: 1px solid $border-gray-dark;
+    }
  }

  &.right-sidebar-collapsed {
@@ -223,6 +235,19 @@
        display: block;
        margin-top: 0;
      }
+
+      .btn-clipboard {
+        border: none;
+
+        &:hover {
+          background: transparent;
+        }
+
+        i {
+          color: #999999;
+        }
+      }
+
    }

  }

--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -115,7 +115,7 @@
      - project_ref = cross_project_reference(@project, issuable)
      .block.project-reference
        .sidebar-collapsed-icon
-          = icon('clipboard')
+          = clipboard_button(clipboard_text: project_ref)
        .title
        .cross-project-reference
          %span