diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-11-22 17:50:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-22 17:50:53 +0100 |
commit | 717fd9fdd6b8e3246459690a3f5b3453461c724a (patch) | |
tree | 0241a72516fa72ca5a333327e98dbe88764e948c | |
parent | 3e7bbaa2b8f8c78fa51d101afacd083355ef4086 (diff) | |
parent | 3fa81d6c35d23d21ceee7844f07afe56fc86961e (diff) | |
download | nextcloud-server-717fd9fdd6b8e3246459690a3f5b3453461c724a.tar.gz nextcloud-server-717fd9fdd6b8e3246459690a3f5b3453461c724a.zip |
Merge pull request #2229 from nextcloud/select2-fix-bis
Select2 fix bis
-rw-r--r-- | apps/systemtags/css/systemtagsfilelist.css | 2 | ||||
-rw-r--r-- | core/css/inputs.css | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/systemtags/css/systemtagsfilelist.css b/apps/systemtags/css/systemtagsfilelist.css index 2da8cd40012..6318d43687e 100644 --- a/apps/systemtags/css/systemtagsfilelist.css +++ b/apps/systemtags/css/systemtagsfilelist.css @@ -9,6 +9,7 @@ */ #app-content-systemtagsfilter .select2-container { width: 30%; + margin-left: 10px; } #app-content-systemtagsfilter .select2-choices { @@ -19,7 +20,6 @@ box-sizing: content-box; border-radius: 3px; border: 1px solid #ddd; - margin: 3px 3px 3px 0; padding: 0; min-height: auto; } diff --git a/core/css/inputs.css b/core/css/inputs.css index 3d74ff38271..f2233395658 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -243,8 +243,8 @@ select:hover { #select2-drop .select2-search input { width: calc(100% - 14px); min-height: auto; - background: url('../img/actions/search.svg') no-repeat right center; - background-origin: content-box; + background: url('../img/actions/search.svg') no-repeat right center !important; + background-origin: content-box !important; } #select2-drop .select2-results { max-height: 250px; @@ -252,7 +252,6 @@ select:hover { padding: 0; } #select2-drop .select2-results .select2-result-label { - padding: 12px !important; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -340,7 +339,7 @@ select:hover { border: none; } .select2-container .select2-choice .select2-arrow b { - background: url('../img/actions/triangle-s.svg') no-repeat center; + background: url('../img/actions/triangle-s.svg') no-repeat center !important; opacity: .5; } .select2-container .select2-choice:hover .select2-arrow b, |