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:
Benjamin Neff 2017-02-11 19:37:30 +01:00
commit cdb220be8d
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
15 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -13,6 +13,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)

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

@ -107,10 +107,10 @@ $default-border-radius: 3px;
opacity: 0.9; opacity: 0.9;
a { a {
color: lighten($blue, 25%); color: lighten($link-color, 25%);
} }
a:visited { a:visited {
color: $blue; color: $link-color;
} }
} }
.desc { .desc {

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

@ -33,7 +33,7 @@ $brand-success: #8EDE3D !default;
// $text-color: $gray-dark // $text-color: $gray-dark
//** Global textual link color. //** Global textual link color.
$link-color: rgb(42,156,235) !default; $link-color: $blue !default;
//** Link hover color set via `darken()` function. //** Link hover color set via `darken()` function.
// $link-hover-color: darken($link-color, 15%) // $link-hover-color: darken($link-color, 15%)
//** Link hover decoration. //** Link hover decoration.
@ -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: $blue; $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

2
app/assets/stylesheets/color_themes/_color_theme_override_dark.scss
View file

@ -56,7 +56,7 @@ body {
.opengraph a { color: lighten($gray-lighter, 27%); } .opengraph a { color: lighten($gray-lighter, 27%); }
.tag:hover { background-color: desaturate(darken($blue, 35%), 20%); } .tag:hover { background-color: desaturate(darken($link-color, 35%), 20%); }
#profile_container .profile_header { #profile_container .profile_header {
#author_info #sharing_message.entypo-check { color: lighten($green, 10%); } #author_info #sharing_message.entypo-check { color: lighten($green, 10%); }

2
app/assets/stylesheets/comments.scss
View file

@ -39,7 +39,7 @@
} }
>.highlighted { >.highlighted {
border-left: 3px solid $blue; border-left: 3px solid $link-color;
padding-left: 3px; padding-left: 3px;
} }
} }

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

@ -73,7 +73,7 @@
} }
&:hover, &.unread:hover, &.selected:hover { &:hover, &.unread:hover, &.selected:hover {
background-color: lighten($blue,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: $blue; } &.selected { background-color: $brand-primary; }
.last_author, .last_message { .last_author, .last_message {
font-size: 12px; font-size: 12px;
@ -144,7 +144,7 @@
float: right; float: right;
line-height: normal; line-height: normal;
font-weight: normal; font-weight: normal;
color: $blue; color: $link-color;
} }
} }

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/hovercard.scss
View file

@ -53,7 +53,7 @@
padding-bottom: 0px; padding-bottom: 0px;
font-size: 16px; font-size: 16px;
a { a {
color: $blue; color: $link-color;
font-weight: bold !important; font-weight: bold !important;
} }
} }

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: $blue; background-color: $brand-primary;
border-color: $blue; border-color: $brand-primary;
color: $white; color: $white;
} }
} }

2
app/assets/stylesheets/opengraph.scss
View file

@ -15,7 +15,7 @@
} }
} }
a:hover { a:hover {
color: $blue; color: $link-color;
} }
.thumb { .thumb {

2
app/assets/stylesheets/publisher.scss
View file

@ -102,7 +102,7 @@
padding-left: 10px; padding-left: 10px;
margin-bottom: 0; margin-bottom: 0;
color: lighten($text-grey,20%); color: lighten($text-grey,20%);
a { color: lighten($blue,20%); } a { color: lighten($link-color, 20%); }
} }
&.with_attachments #photodropzone_container { &.with_attachments #photodropzone_container {

4
app/assets/stylesheets/single-post-view.scss
View file

@ -83,7 +83,7 @@
color: #f55f5a; color: #f55f5a;
} }
i.entypo-reshare:hover { i.entypo-reshare:hover {
color: #3f8fba; color: $blue;
} }
time { time {
float: right; float: right;
@ -115,7 +115,7 @@
.no-comments { text-align: center; } .no-comments { text-align: center; }
a { a {
color: $blue; color: $link-color;
} }
.count { .count {
float: left; float: left;

2
app/assets/stylesheets/stream_element.scss
View file

@ -90,7 +90,7 @@
font-weight: bold; font-weight: bold;
margin-bottom: 4px; margin-bottom: 4px;
} }
a.author-name { color: $blue; } a.author-name { color: $link-color; }
.feedback { .feedback {
margin-top: 5px; margin-top: 5px;
font-size: $font-size-small; font-size: $font-size-small;

8
app/assets/stylesheets/tag.scss
View file

@ -3,15 +3,15 @@
font-weight: bold; font-weight: bold;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
background-color: lighten($blue, 47%); background-color: lighten($link-color, 47%);
} }
} }
a.tag { color: $blue; } a.tag { color: $link-color; }
h1.tag { h1.tag {
border-bottom: 2px dotted $blue; border-bottom: 2px dotted $link-color;
&:hover { border-bottom: 2px dotted $blue; } &:hover { border-bottom: 2px dotted $link-color; }
} }
.info { .info {