diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 21:43:11 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 21:43:11 +0100 |
commit | f66454beaa880d283ef527c3a32a3076fedf6551 (patch) | |
tree | 6852eca364013dd171727b2795de0993563af91b /app/assets/stylesheets/framework/lists.scss | |
parent | 792f2bbe0b306bda266dfc817edf33b4c9e36a0f (diff) | |
download | gitlab-ce-f66454beaa880d283ef527c3a32a3076fedf6551.tar.gz |
Add indication to merge request list item that MR cannot be merged automatically
Diffstat (limited to 'app/assets/stylesheets/framework/lists.scss')
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index a798ae812e3..2404f8898fe 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -124,6 +124,24 @@ ul.content-list { padding: 10px 14px; } } + + ul.controls { + list-style: none; + + li { + float: left; + padding-right: 10px; + + .author_link { + display: inline-block; + + .avatar-inline { + margin-left: 0; + margin-right: 0; + } + } + } + } } } |