summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-04-08 21:53:17 -0400
committerJules Laplace <jules@okfoc.us>2015-04-08 21:53:17 -0400
commitb082172ae07384bdcafb240bd6213b5f1e373319 (patch)
tree20835a9166e1b5b3b0b3a0b65672b18ae14b0219
parent3925093328fa19ff654c633b400d0cf0b16fd342 (diff)
merge
-rw-r--r--examples/index.js2
-rw-r--r--themes/okadmin/public/css/main.css1
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/index.js b/examples/index.js
index 438e871..669715d 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -13,7 +13,7 @@ var app = okcms.createApp({
bread: {
type: {type: 'string', id: true},
title: {type: 'string'},
- description: {type: 'string'}
+ description: {type: 'text'}
}
},
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 37a90b3..007740f 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -146,6 +146,7 @@ label {
}
.main.resource form textarea {
+ padding: 0.5em;
height: 15em;
}
.main.resource form button {