diff options
author | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-13 17:23:56 +0200 |
---|---|---|
committer | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-13 17:23:56 +0200 |
commit | add9673ad6583c750b784ea21660843fccbdc898 (patch) | |
tree | 1e2d4659086dca2ef957b28768d43b0c6f15bf6d /core | |
parent | 31df4c00eca8ac3de3f72ae01252147a289f15cd (diff) | |
download | nextcloud-server-add9673ad6583c750b784ea21660843fccbdc898.tar.gz nextcloud-server-add9673ad6583c750b784ea21660843fccbdc898.zip |
merging tanghus category CSS
Diffstat (limited to 'core')
-rw-r--r-- | core/css/oc-vcategories.css | 7 | ||||
-rw-r--r-- | core/css/styles.css | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/core/css/oc-vcategories.css b/core/css/oc-vcategories.css deleted file mode 100644 index 68ff832bb06..00000000000 --- a/core/css/oc-vcategories.css +++ /dev/null @@ -1,7 +0,0 @@ -#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; } diff --git a/core/css/styles.css b/core/css/styles.css index 5c970191d62..a8efcfc5a23 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -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; } |