Merge branch 'ui-fix' into 'master'

Fix list with controls display

Introduced in !2025

## Before

![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png)

## After

![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !2048

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;
+      }
+    }
+  }
+}