diff options
| author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2017-10-03 14:32:04 +0200 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2017-10-04 01:45:20 +0200 |
| commit | 890d9393cb6808462e6f75704de4588c68d84582 (patch) | |
| tree | 49ea4bbe397e2dca9198defc301572bfc7d05cd6 | |
| parent | c5277ba7d8ebd3a4637cf96ca222cb4c3f6dcbcd (diff) | |
| download | gitlab-ce-mentions-in-comments.tar.gz | |
Moved .gfm-project_member from members.scss to gfm.scssmentions-in-comments
| -rw-r--r-- | app/assets/stylesheets/framework/gfm.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/gfm.scss b/app/assets/stylesheets/framework/gfm.scss index dbdd5a4464b..34a35734acc 100644 --- a/app/assets/stylesheets/framework/gfm.scss +++ b/app/assets/stylesheets/framework/gfm.scss @@ -6,3 +6,14 @@ .gfm-commit_range { @extend .commit-sha; } + +.gfm-project_member { + padding: 0 2px; + border-radius: #{$border-radius-default / 2}; + background-color: $user-mention-bg; + + &:hover { + background-color: $user-mention-bg-hover; + text-decoration: none; + } +} diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 6d469e7a519..b3bab082a35 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -314,14 +314,3 @@ .member-form-control { @include new-style-dropdown; } - -.gfm-project_member { - padding: 0 2px; - border-radius: #{$border-radius-default / 2}; - background-color: $user-mention-bg; - - &:hover { - background-color: $user-mention-bg-hover; - text-decoration: none; - } -} |