Merge branch 'highlighted-note' into 'master'

Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937

Merge branch 'highlighted-note' into 'master'
d22ebcf0 · Jacob Schatz · 8089a77c · 647eccd1 · d22ebcf0 · d22ebcf0
Commit d22ebcf0 authored Feb 24, 2016 by Jacob Schatz
7 changed files
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -158,7 +158,7 @@
          }

          &:hover {
-            background: $hover;
+            background: $row-hover;
          }
        }
      }

--- a/app/assets/stylesheets/framework/jquery.scss
+++ b/app/assets/stylesheets/framework/jquery.scss
@@ -48,8 +48,8 @@

  .ui-state-hover,
  .ui-state-focus {
-    border: 1px solid $hover;
-    background: $hover;
+    border: 1px solid $row-hover;
+    background: $row-hover;
    color: #333;
  }
 }

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -38,7 +38,7 @@
    &.smoke { background-color: $background-color; }

    &:hover {
-      background: $hover;
+      background: $row-hover;
    }

    &:last-child {

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,13 +5,13 @@
  padding: 0;

  .timeline-entry {
-    padding: $gl-padding 0;
+    padding: $gl-padding $gl-btn-padding;
    border-color: $table-border-color;
    color: $gl-gray;
    border-bottom: 1px solid $border-white-light;

    &:target {
-      background: $hover;
+      background: $row-hover;
    }

    &:last-child {

--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -70,7 +70,7 @@ $pagination-bg:                        #fff;
 $pagination-border:                    $border-color;

 $pagination-hover-color:               $gl-gray;
-$pagination-hover-bg:                  $hover;
+$pagination-hover-bg:                  $row-hover;
 $pagination-hover-border:              $border-color;

 $pagination-active-color:              $blue-dark;

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
-$hover: #faf9f9;
+$row-hover: #f4f8fe;
 $gl-text-color: #54565B;
 $gl-text-green: #4A2;
 $gl-text-red: #D12F19;

--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -21,7 +21,7 @@

      &:hover {
        td {
-          background: $hover;
+          background: $row-hover;
        }
        cursor: pointer;
      }