From d5af93643e8cf628be5a7de4a5e10048cb360e00 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Mon, 17 Jul 2017 20:41:20 +1000
Subject: [PATCH] fix padding on filtered search dropdown. Styles should only
apply to li in list
---
.../stylesheets/framework/dropdowns.scss | 32 +++++++++++--------
app/assets/stylesheets/framework/filters.scss | 7 ++--
app/assets/stylesheets/pages/issuable.scss | 2 --
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index f89f2f30443..fbf49f3a813 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -297,18 +297,12 @@
}
.droplab-dropdown {
- .description {
- display: inline-block;
- white-space: normal;
- margin-left: 5px;
- }
-
.dropdown-toggle > i {
pointer-events: none;
}
- li {
- padding: $gl-btn-padding $gl-btn-padding 2px;
+ .dropdown-menu li {
+ padding: $gl-btn-padding;
cursor: pointer;
> a,
@@ -344,9 +338,25 @@
visibility: visible;
}
+ &.divider {
+ margin: 0 8px;
+ padding: 0;
+ border-top: $gray-darkest;
+ }
+
.icon {
visibility: hidden;
}
+
+ .description {
+ display: inline-block;
+ white-space: normal;
+ margin-left: 5px;
+
+ p {
+ margin-bottom: 0;
+ }
+ }
}
.icon {
@@ -354,12 +364,6 @@
vertical-align: top;
padding-top: 2px;
}
-
- .divider {
- margin: 0 8px;
- padding: 0;
- border-top: $gray-darkest;
- }
}
.droplab-dropdown .dropdown-menu,
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index 7e4e5fd7f1c..41184907abb 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -275,7 +275,7 @@
}
.filtered-search-input-dropdown-menu {
- max-height: 215px;
+ max-height: 225px;
max-width: 280px;
overflow: auto;
@@ -382,10 +382,6 @@
}
}
-.dropdown-menu .filter-dropdown-item {
- padding: 0;
-}
-
@media (max-width: $screen-xs-max) {
.issues-details-filters {
padding: 0 0 10px;
@@ -435,6 +431,7 @@
.fa {
width: 15px;
+ line-height: $line-height-base;
}
.dropdown-label-box {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 56a4b53ed61..e858ef427b0 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -813,8 +813,6 @@
}
.description {
- margin-bottom: 10px;
-
.text {
margin: 0;
}
--
GitLab