diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
| commit | afcb0aee40230c68dd99f5ea2501b7ba7e444560 (patch) | |
| tree | 5ccd10e78128c70e71a36ca9080a652a7bd833d5 /core/css/styles.css | |
| parent | 02dc34320978bfbcb30dea34b87808837586bb65 (diff) | |
| parent | b9f9228a22944184803a8835282862e468812c1d (diff) | |
| download | nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.tar.gz nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.zip | |
fix merge conflicts
Diffstat (limited to 'core/css/styles.css')
| -rw-r--r-- | core/css/styles.css | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index e5380b1b6b0..5cc15f4b5b6 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -106,7 +106,7 @@ label.infield { cursor: text !important; } #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } -.action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +.action, .selectedActions a, #logout { opacity:.5; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } .action { width: 16px; height: 16px; } .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } @@ -132,9 +132,19 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px } -/* ---- DIALOGS ---- */ +/* ---- DIALOGS ---- */ #dirtree {width: 100%;} #filelist {height: 270px; overflow:scroll; background-color: white;} .filepicker_element_selected { background-color: lightblue;} .filepicker_loader {height: 120px; width: 100%; background-color: #333; opacity: 0.3; visibility: visible; position:absolute; top:0; left:0; text-align:center; padding-top: 150px;} + + +/* ---- CATEGORIES ---- */ +#categoryform .scrollarea { position: absolute; left: 10px; top: 10px; right: 10px; bottom: 50px; overflow: auto; border:1px solid #ddd; background: #f8f8f8; } +#categoryform .bottombuttons { position: absolute; bottom: 10px;} +#categoryform .bottombuttons * { float: left;} +/*#categorylist { border:1px solid #ddd;}*/ +#categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } +#categorylist li:hover, li:active { background:#eee; } +#category_addinput { width: 10em; } |