Commit 19837682 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !2048
parents 0549b5e8 ab8ab9b1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
padding: 0; padding: 0;
list-style: none; list-style: none;
li { > li {
padding: 10px 15px; padding: 10px 15px;
min-height: 20px; min-height: 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
...@@ -123,11 +123,25 @@ ul.content-list { ...@@ -123,11 +123,25 @@ ul.content-list {
padding: 10px 14px; padding: 10px 14px;
} }
} }
}
}
ul.controls { .panel > .content-list {
li {
margin: 0;
}
}
ul.controls {
padding-top: 1px;
float: right;
list-style: none; list-style: none;
li { .btn {
padding: 10px 14px;
}
> li {
float: left; float: left;
padding-right: 10px; padding-right: 10px;
...@@ -140,12 +154,4 @@ ul.content-list { ...@@ -140,12 +154,4 @@ ul.content-list {
} }
} }
} }
}
}
}
.panel > .content-list {
li {
margin: 0;
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment