diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-01 21:27:11 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-01 21:27:11 +0000 |
| commit | 07fb3815fe94b212fbd781dcaac2a30ca79b9098 (patch) | |
| tree | 727eea00d2eae07a44440ed22a7e5964118147b6 | |
| parent | 0f96a6c25ad364b1ef945788c463653e93b18d96 (diff) | |
| parent | d7c76d09993e2be529f3bb023aaea579e1c32f95 (diff) | |
| download | gitlab-ce-07fb3815fe94b212fbd781dcaac2a30ca79b9098.tar.gz | |
Merge branch '17187-hover-row' into 'master'
Implement new row hover style
## What does this MR do?
Implement new row hover style
## What are the relevant issue numbers?
Closes #17187
## Screenshots (if relevant)
cc @dzaporozhets
See merge request !4422
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 8c54d935b6c..f253da814bc 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -63,7 +63,8 @@ $gl-padding-top: 10px; /* * Misc */ -$row-hover: #f4f8fe; +$row-hover: #f7faff; +$row-hover-border: #b2d7ff; $progress-color: #c0392b; $avatar_radius: 50%; $header-height: 50px; diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index a84fc2e0318..f16fc7f388f 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -15,16 +15,23 @@ margin-bottom: 0; tr { - > td, > th { + border-bottom: 1px solid $table-border-gray; + border-top: 1px solid $table-border-gray; + + td, th { line-height: 23px; } &:hover { + cursor: pointer; + td { - background: $row-hover; + background-color: $row-hover; + border-top: 1px solid $row-hover-border; + border-bottom: 1px solid $row-hover-border; } - cursor: pointer; } + &.selected { td { background: $gray-dark; |