diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 20:06:31 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 20:06:31 +0300 |
| commit | dd6a24d4e746ff65800a5a06374a2f8c0b8a91dd (patch) | |
| tree | 4ffc46a0385305575028cf48a1d60115cd1d4ddf /app/assets/stylesheets | |
| parent | 5c8c33c92dbc9afba077e4ae54a7bce39b591f68 (diff) | |
| parent | c36544de9fa07f9d9aaa162a7c70a9dc644ae23b (diff) | |
| download | gitlab-ce-dd6a24d4e746ff65800a5a06374a2f8c0b8a91dd.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b-existingrevert-c676283b
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index b035bfc9f3c..68fc6da6c1b 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -22,6 +22,11 @@ .table.builds { min-width: 1200px; + + .branch-commit { + width: 33%; + } + } } @@ -385,6 +390,8 @@ left: auto; right: -214px; top: -9px; + max-height: 245px; + overflow-y: scroll; a:hover { .ci-status-text { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 78bc4b79e86..87548dcb590 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -146,7 +146,8 @@ } .project-repo-btn-group, - .notification-dropdown { + .notification-dropdown, + .project-dropdown { margin-left: 10px; } |