diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-23 19:56:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-23 19:56:07 +0200 |
| commit | 42a570788b22bcf28d2cc0124dbfa4cdeeb9ea04 (patch) | |
| tree | f6a385649abba09d709e265c1ae5f2c25f83fff3 /core | |
| parent | 6d92ebca454ab2e6533d0b7a08bfe30d20005820 (diff) | |
| parent | f5c9fe9ece6fdfb35bab5eefdf83830b5045b5a8 (diff) | |
| download | nextcloud-server-42a570788b22bcf28d2cc0124dbfa4cdeeb9ea04.tar.gz nextcloud-server-42a570788b22bcf28d2cc0124dbfa4cdeeb9ea04.zip | |
Merge branch 'master' into movable_apps
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/multiselect.css | 10 | ||||
| -rw-r--r-- | core/css/styles.css | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css index 1202ea18427..040b0f46ed3 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -1,7 +1,11 @@ +/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net + This file is licensed under the Affero General Public License version 3 or later. + See the COPYING-README file. */ + ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border:1px solid #ddd; border-top:none; -moz-border-radius-bottomleft:.5em; -webkit-border-bottom-left-radius:.5em; border-bottom-left-radius:.5em; -moz-border-radius-bottomright:.5em; -webkit-border-bottom-right-radius:.5em; border-bottom-right-radius:.5em; -moz-box-shadow:0 1px 1px #ddd; -webkit-box-shadow:0 1px 1px #ddd; box-shadow:0 1px 1px #ddd; } ul.multiselectoptions>li{ white-space:nowrap; overflow: hidden; } -div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block; vertical-align: bottom; } +div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block; vertical-align: bottom; min-width:100px; max-width:400px; } div.multiselect.active { background-color:#fff; border-bottom:none; border-bottom-left-radius:0; border-bottom-right-radius:0; z-index:50; position:relative } -div.multiselect>span:first-child { margin-right:2em; float:left; } -div.multiselect>span:last-child { float:right; position:relative } +div.multiselect>span:first-child { margin-right:2em; float:left; width:90%; overflow:hidden; text-overflow:ellipsis; } +div.multiselect>span:last-child { position:absolute; right:.8em; } ul.multiselectoptions input.new{ margin:0; padding-bottom:0.2em; padding-top:0.2em; border-top-left-radius:0; border-top-right-radius:0; } diff --git a/core/css/styles.css b/core/css/styles.css index ccebc984fbb..945e5846683 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Jan-Christoph Borchardt +/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net This file is licensed under the Affero General Public License version 3 or later. See the COPYING-README file. */ |