From b082172ae07384bdcafb240bd6213b5f1e373319 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 8 Apr 2015 21:53:17 -0400 Subject: merge --- examples/index.js | 2 +- themes/okadmin/public/css/main.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 { -- cgit v1.2.3-70-g09d2