diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-07 21:49:27 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-07 21:49:27 +0000 |
| commit | d9313795e744c83d1b2c7235b34438a87554562d (patch) | |
| tree | e78ef594e4b672d9cb39b06bdb6243cf53016626 /app/assets/stylesheets | |
| parent | 673b6be1fecedd3a4e7126134f3a764694fcf327 (diff) | |
| parent | fb41187b7ff6154675ab07b75c8be1067efa8f69 (diff) | |
| download | gitlab-ce-d9313795e744c83d1b2c7235b34438a87554562d.tar.gz | |
Merge branch '37824-many-branches-lock-server' into 'master'
Project with many branches can lock server running "git branch --contains XXX"
Closes #37824
See merge request gitlab-org/gitlab-ce!14812
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/wells.scss | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 5f9756bf58a..68824ff8418 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -52,6 +52,37 @@ .label.label-gray { background-color: $well-expand-item; } + + .branches { + display: inline; + } + + .branch-link { + margin-bottom: 2px; + } + + .limit-box { + cursor: pointer; + display: inline-flex; + align-items: center; + background-color: $red-100; + border-radius: $border-radius-default; + text-align: center; + + &:hover { + background-color: $red-200; + } + + .limit-icon { + margin: 0 8px; + } + + .limit-message { + line-height: 16px; + margin-right: 8px; + font-size: 12px; + } + } } .light-well { |