Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-02-23 13:46:40 +0300
committerPhil Hughes <me@iamphill.com>2017-02-28 17:36:30 +0300
commitdb44e5569851d5542ae3fbe283cd7ccf0522b46a (patch)
tree6dfc788e3dcdcd4b7446ad381617077b9d5ca4ff /app/assets/stylesheets/highlight/solarized_light.scss
parent54f6357ba3d7f31bdb0009a041e48c3a6be8e2ff (diff)
Visually display that expanded diff lines cant be commented on
Previously you just had to hover over a line to see if it could be commented on, this changes that by changing the background color & borders to show that the line cant have a comment.
Diffstat (limited to 'app/assets/stylesheets/highlight/solarized_light.scss')
-rw-r--r--app/assets/stylesheets/highlight/solarized_light.scss16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index 2e3b68f1a58..14ac0d9d860 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -166,6 +166,22 @@ $solarized-light-il: #2aa198;
.line_content.match {
@include matchLine;
}
+
+ &:not(.diff-expanded) + .diff-expanded,
+ &.diff-expanded + .line_holder:not(.diff-expanded) {
+ > .diff-line-num,
+ > .line_content {
+ border-top: 1px solid #d2cdbd;
+ }
+ }
+
+ &.diff-expanded {
+ > .diff-line-num,
+ > .line_content {
+ background: #ece6d4;
+ border-color: #ece6d4;
+ }
+ }
}
// highlight line via anchor