summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-03-16 12:17:58 +0100
committerGeorg Ehrke <dev@georgswebsite.de>2012-03-16 12:17:58 +0100
commit27218f85cb54d543f3a5cf631785174193d0b42c (patch)
tree638f856a31deeb45da8fecdbe943aebe9376dc57 /core/css
parentc40668e3a90e3f9509931ac6226b01e57953ca7b (diff)
parent0fadbee69941efe7d08dc8533145046a9cccb76e (diff)
downloadnextcloud-server-27218f85cb54d543f3a5cf631785174193d0b42c.tar.gz
nextcloud-server-27218f85cb54d543f3a5cf631785174193d0b42c.zip
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'core/css')
-rw-r--r--core/css/oc-vcategories.css7
-rw-r--r--core/css/styles.css2
2 files changed, 8 insertions, 1 deletions
diff --git a/core/css/oc-vcategories.css b/core/css/oc-vcategories.css
new file mode 100644
index 00000000000..68ff832bb06
--- /dev/null
+++ b/core/css/oc-vcategories.css
@@ -0,0 +1,7 @@
+#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 96c1d5d40f0..720fe578b92 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -60,7 +60,7 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
#leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
#leftcontent li, .leftcontent 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; }
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
-#rightcontent, .rightcontent { position:fixed; top: 6.4em; left: 32.5em; }
+#rightcontent, .rightcontent { position:fixed; top: 6.4em; left: 32.5em; overflow: auto }
/* LOG IN & INSTALLATION ------------------------------------------------------------ */