diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-10 01:17:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-10 01:17:34 +0000 |
| commit | 19837682e0e2d8394dedb6432e004cb853d73cb1 (patch) | |
| tree | 151ffea35a56b32da460ca6901890c903703d3f7 /app | |
| parent | 0549b5e8ee6f6e40a3fd770b11061a005b27e628 (diff) | |
| parent | ab8ab9b10c6bda35d3a82e0cf52f45c1cd81eb09 (diff) | |
| download | gitlab-ce-19837682e0e2d8394dedb6432e004cb853d73cb1.tar.gz | |
Merge branch 'ui-fix' into 'master'
Fix list with controls display
Introduced in !2025
## Before
## After
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2048
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 481e3f33a20..cc48f8c8166 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -7,7 +7,7 @@ padding: 0; list-style: none; - li { + > li { padding: 10px 15px; min-height: 20px; border-bottom: 1px solid #eee; @@ -123,24 +123,6 @@ 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; - } - } - } - } } } @@ -149,3 +131,27 @@ ul.content-list { margin: 0; } } + +ul.controls { + padding-top: 1px; + float: right; + list-style: none; + + .btn { + padding: 10px 14px; + } + + > li { + float: left; + padding-right: 10px; + + .author_link { + display: inline-block; + + .avatar-inline { + margin-left: 0; + margin-right: 0; + } + } + } +} |