Unverified Commit dc8d6652 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Use $link-color for text and $brand-primary for backgrounds/buttons 

closes #7318
parent dba8de54

Changelog.md

+1 −0
Original line number Diff line number Diff line 
# 0.6.4.0



## Refactor

* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)



## Bug fixes

* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)

app/assets/stylesheets/bootstrap-variables.scss

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ $list-group-border: transparent; 
$list-group-border-radius: 0;



//** Background color of single list items on hover

$list-group-hover-bg: $link-color;

$list-group-hover-bg: $brand-primary;

//** Text color of active list items

$list-group-active-color: $white;

//** Background color of active list items

app/assets/stylesheets/conversations.scss

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    }



    &:hover, &.unread:hover, &.selected:hover {

      background-color: lighten($link-color, 5%);

      background-color: lighten($brand-primary, 5%);

      cursor: pointer;

      .participants {

        border-color: rgba($border-grey, 1);
@@ -84,7 +84,7 @@ 
    }



    &.unread { background-color: $background-grey; }

    &.selected { background-color: $link-color; }

    &.selected { background-color: $brand-primary; }



    .last_author, .last_message {

      font-size: 12px;

app/assets/stylesheets/header.scss

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
          color: $gray-light;

          padding-left: 55px;

          &:hover {

            background-color: $link-color;

            background-color: $brand-primary;

            color: $gray-lighter;

          }

        }
@@ -105,7 +105,7 @@ 
        }

      }

      .view_all {

        background-color: $link-color;

        background-color: $brand-primary;

        border-top: 3px solid $dropdown-bg;

        text-align: center;

        a {

app/assets/stylesheets/markdown-editor.scss

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
  > li {

    > a { padding: 7px 15px; }



    &:not(.active) * { color: $brand-primary; }

    &:not(.active) * { color: $link-color; }



    &.active * { color: $black; }

  }