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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2017-02-13 14:21:29 +01:00
commit 99351bd152
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -15,6 +15,7 @@
## Refactor
* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
* Increase time to wait before showing the hovercard [#7319](https://github.com/diaspora/diaspora/pull/7319)
* Remove some unused color-theme overrides [#7325](https://github.com/diaspora/diaspora/pull/7325)
## Bug fixes
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)

13
app/assets/stylesheets/color_themes/_color_theme_override.scss
View file

@ -1,18 +1,5 @@
/* Raw CSS */
body {
a,
a.tag,
.btn-link,
#main_stream .stream-element > .media a.author-name,
#hovercard h4 a,
.stream-element .from a.self {
color: $link-color;
&:hover, &:focus {
color: darken($link-color, 10%);
}
}
#publisher_textarea_wrapper > #button_container > span.markdownIndications > a {
color: fade-out($link-color, 0.4);
}