nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
closes #7318
This commit is contained in:
Steffen van Bergerem 2017-02-11 01:01:22 +01:00 committed by Benjamin Neff
parent dba8de5488
commit dc8d66520b
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -1,6 +1,7 @@
# 0.6.4.0 # 0.6.4.0
## Refactor ## Refactor
* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
## Bug fixes ## Bug fixes
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281) * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)

2
app/assets/stylesheets/bootstrap-variables.scss vendored
View file

@ -676,7 +676,7 @@ $list-group-border: transparent;
$list-group-border-radius: 0; $list-group-border-radius: 0;
//** Background color of single list items on hover //** 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 //** Text color of active list items
$list-group-active-color: $white; $list-group-active-color: $white;
//** Background color of active list items //** Background color of active list items

4
app/assets/stylesheets/conversations.scss
View file

@ -73,7 +73,7 @@
} }
&:hover, &.unread:hover, &.selected:hover { &:hover, &.unread:hover, &.selected:hover {
background-color: lighten($link-color, 5%); background-color: lighten($brand-primary, 5%);
cursor: pointer; cursor: pointer;
.participants { .participants {
border-color: rgba($border-grey, 1); border-color: rgba($border-grey, 1);
@ -84,7 +84,7 @@
} }
&.unread { background-color: $background-grey; } &.unread { background-color: $background-grey; }
&.selected { background-color: $link-color; } &.selected { background-color: $brand-primary; }
.last_author, .last_message { .last_author, .last_message {
font-size: 12px; font-size: 12px;

4
app/assets/stylesheets/header.scss
View file

@ -53,7 +53,7 @@
color: $gray-light; color: $gray-light;
padding-left: 55px; padding-left: 55px;
&:hover { &:hover {
background-color: $link-color; background-color: $brand-primary;
color: $gray-lighter; color: $gray-lighter;
} }
} }
@ -105,7 +105,7 @@
} }
} }
.view_all { .view_all {
background-color: $link-color; background-color: $brand-primary;
border-top: 3px solid $dropdown-bg; border-top: 3px solid $dropdown-bg;
text-align: center; text-align: center;
a { a {

2
app/assets/stylesheets/markdown-editor.scss
View file

@ -115,7 +115,7 @@
> li { > li {
> a { padding: 7px 15px; } > a { padding: 7px 15px; }
&:not(.active) * { color: $brand-primary; } &:not(.active) * { color: $link-color; }
&.active * { color: $black; } &.active * { color: $black; }
} }

4
app/assets/stylesheets/navbar_left.scss
View file

@ -24,8 +24,8 @@
} }
&:hover, &:hover a, &:hover [class^="entypo"] { &:hover, &:hover a, &:hover [class^="entypo"] {
background-color: $link-color; background-color: $brand-primary;
border-color: $link-color; border-color: $brand-primary;
color: $white; color: $white;
} }
} }