Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
dc8d6652
Unverified
Commit
dc8d6652
authored
Feb 11, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Feb 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use $link-color for text and $brand-primary for backgrounds/buttons
closes #7318
parent
dba8de54
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
8 deletions
+9
-8
Changelog.md
Changelog.md
+1
-0
app/assets/stylesheets/bootstrap-variables.scss
app/assets/stylesheets/bootstrap-variables.scss
+1
-1
app/assets/stylesheets/conversations.scss
app/assets/stylesheets/conversations.scss
+2
-2
app/assets/stylesheets/header.scss
app/assets/stylesheets/header.scss
+2
-2
app/assets/stylesheets/markdown-editor.scss
app/assets/stylesheets/markdown-editor.scss
+1
-1
app/assets/stylesheets/navbar_left.scss
app/assets/stylesheets/navbar_left.scss
+2
-2
No files found.
Changelog.md
View file @
dc8d6652
# 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
View file @
dc8d6652
...
...
@@ -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
View file @
dc8d6652
...
...
@@ -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
View file @
dc8d6652
...
...
@@ -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
View file @
dc8d6652
...
...
@@ -115,7 +115,7 @@
>
li
{
>
a
{
padding
:
7px
15px
;
}
&
:not
(
.active
)
*
{
color
:
$
brand-primary
;
}
&
:not
(
.active
)
*
{
color
:
$
link-color
;
}
&
.active
*
{
color
:
$black
;
}
}
...
...
app/assets/stylesheets/navbar_left.scss
View file @
dc8d6652
...
...
@@ -24,8 +24,8 @@
}
&
:hover
,
&
:hover
a
,
&
:hover
[
class
^=
"entypo"
]
{
background-color
:
$
link-color
;
border-color
:
$
link-color
;
background-color
:
$
brand-primary
;
border-color
:
$
brand-primary
;
color
:
$white
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment