summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-10-11 04:17:59 -0700
committerThomas Tanghus <thomas@tanghus.net>2013-10-11 04:17:59 -0700
commit31714f8871eb21b9c6097e0c4edcbe97fb8a35a3 (patch)
tree82bb1b1c2d26fab819b69444d28f2f0882669dca /core/css
parent4336d42ab095c304d0a46bb30c2d0203e606597e (diff)
parent9c230f8c85cf80efb10093e66e1197c200c185c1 (diff)
downloadnextcloud-server-31714f8871eb21b9c6097e0c4edcbe97fb8a35a3.tar.gz
nextcloud-server-31714f8871eb21b9c6097e0c4edcbe97fb8a35a3.zip
Merge pull request #5133 from owncloud/js_vcategories_to_tags
Js vcategories to tags
Diffstat (limited to 'core/css')
-rw-r--r--core/css/jquery.ocdialog.css1
-rw-r--r--core/css/styles.css24
2 files changed, 16 insertions, 9 deletions
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index aa72eaf8474..236968e3245 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -29,6 +29,7 @@
bottom: 0;
display: block;
margin-top: 10px;
+ width: 100%;
}
.oc-dialog-close {
diff --git a/core/css/styles.css b/core/css/styles.css
index 728fd47bc9f..1a521019d98 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -753,15 +753,21 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
height: 16px;
}
-
-/* ---- 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, #categorylist li:active { background:#eee; }
-#category_addinput { width:10em; }
+/* ---- TAGS ---- */
+#tagsdialog .content {
+ width: 100%; height: 280px;
+}
+#tagsdialog .scrollarea {
+ overflow:auto; border:1px solid #ddd;
+ width: 100%; height: 240px;
+}
+#tagsdialog .bottombuttons {
+ width: 100%; height: 30px;
+}
+#tagsdialog .bottombuttons * { float:left;}
+#tagsdialog .taglist 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; }
+#tagsdialog .taglist li:hover, #tagsdialog .taglist li:active { background:#eee; }
+#tagsdialog .addinput { width: 90%; clear: both; }
/* ---- APP SETTINGS ---- */
.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:100; }