summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-21 09:07:53 +0000
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-25 09:54:05 -0400
commitcf0c6e87eabcc637a145d1bc7fc89c914e7c0781 (patch)
tree4f7bc754e42de5bda6306b44529221947477ef23
parent201101dfff831fc3c05475b7219d2870ca700fa5 (diff)
downloadgitlab-ce-cf0c6e87eabcc637a145d1bc7fc89c914e7c0781.tar.gz
Fixed some colours in sidebar
-rw-r--r--app/assets/stylesheets/pages/issuable.scss8
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml4
2 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 70a8fc5a9e2..88c1b614c74 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -30,6 +30,10 @@
}
.issuable-sidebar {
+ a {
+ color: inherit;
+ }
+
.block {
@include clearfix;
padding: $gl-padding 0;
@@ -89,7 +93,7 @@
}
.cross-project-reference {
- color: $gl-link-color;
+ color: inherit;
span {
white-space: nowrap;
@@ -258,7 +262,7 @@
text-decoration: none;
}
}
-
+
.dropdown-menu-toggle {
width: 100%;
padding-top: 6px;
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index d6328216dae..70de11fe136 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -44,7 +44,7 @@
%span.username
= issuable.assignee.to_reference
- else
- %span.assign-yourself
+ %span.assign-yourself
No assignee -
%a.js-assign-yourself{href:'#'}
assign yourself
@@ -153,4 +153,4 @@
new MilestoneSelect();
new LabelsSelect();
new IssuableContext('#{current_user.to_json(only: [:username, :id, :name])}');
- new Subscription('.subscription') \ No newline at end of file
+ new Subscription('.subscription')