diff options
| -rw-r--r-- | examples/db.json | 9 | ||||
| -rw-r--r-- | examples/index.js | 1 | ||||
| -rw-r--r-- | themes/okadmin/public/css/main.css | 92 | ||||
| -rw-r--r-- | themes/okadmin/templates/partials/head.liquid | 2 | ||||
| -rw-r--r-- | themes/okadmin/templates/resource.liquid | 10 | ||||
| -rw-r--r-- | themes/okadmin/templates/resource_new.liquid | 10 |
6 files changed, 93 insertions, 31 deletions
diff --git a/examples/db.json b/examples/db.json index 1d0cba4..e0ea06b 100644 --- a/examples/db.json +++ b/examples/db.json @@ -2,9 +2,9 @@ "meta": [], "bread": [ { - "type": "rye", - "description": "really a very tasty bread!", - "id": "rye" + "type": "pretzel", + "description": "really a very tasty bread! yup yes", + "id": "pretzel" }, { "type": "bagel", @@ -14,7 +14,8 @@ { "type": "pumpernickel", "description": "grandma's recipe", - "id": "pumpernickel" + "id": "pumpernickel", + "title": "Pumpernickel" } ], "page": [ diff --git a/examples/index.js b/examples/index.js index e55b717..d64f2f9 100644 --- a/examples/index.js +++ b/examples/index.js @@ -12,6 +12,7 @@ var app = okcms.createApp({ }, bread: { type: {type: 'string', id: true}, + title: {type: 'string'}, description: {type: 'string'} } }, diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css index 88628e3..37a90b3 100644 --- a/themes/okadmin/public/css/main.css +++ b/themes/okadmin/public/css/main.css @@ -2,7 +2,12 @@ html, body { margin: 0; padding: 0; font-family: "Helvetica", sans-serif; - font-size: 16px; + font-weight: 300; + font-size: 0.9em; + background-image: url('http://okfoc.us/assets/images/photocopy.png'); + background-position: bottom center; + background-repeat: repeat; + background-attachment: scroll; } ul { @@ -11,34 +16,36 @@ ul { } a { - color: #0000ff; + color: #A200FF; text-decoration: none; + font-family: Monaco, monospace; + text-transform: uppercase; } a:hover { - border-bottom: 3px solid #0000ff; + border-bottom: 1px solid #A200FF; } a:visited { - color: #0000ff; + color: #A200FF; } .admin-header { height: 50px; - background-color: rgb(233, 233, 233); + background-color: #fff; + border-bottom: 2px solid #ddd; } .admin-header .breadcrumb { - margin-left: 2em; + margin-left: 1em; font-size: 2em; color: rgba(0, 0, 0, 0.25); line-height: 50px; } .admin-header .site-link { - font-size: 1.5em; float: right; - margin-right: 10%; + margin-right: 1em; line-height: 50px; } @@ -47,7 +54,32 @@ a:visited { min-width: 200px; margin: 1em; padding: 1em; - background-color: rgba(0, 0, 0, 0.1); + background-color: #fff; + border: 2px solid #ddd; +} + +nav { + background: white; + width: 10%; + margin: 2.5em 1em; + padding: 1em; + float: left; + display: block; +} + +h2 { + margin-bottom: 1.5em; + line-height: 1; + text-transform: uppercase; + font-size: 14px; + letter-spacing: 6px; + text-align: left; + font-style: italic; + font-family: Comic Sans MS, cursive; + font-weight: 100; + color: #333; + -webkit-transform: rotate(-1deg); + transform: rotate(-1deg); } .main.index .resource-category a.add-new { @@ -65,37 +97,61 @@ a:visited { border-bottom: 3px solid rgba(0, 0, 0, 0.25); } +.main.resource { + float: left; + margin-top: 2em; + width: 80%; +} + .main.resource > * { margin: 1em 1em; } .main.resource form { - background-color: rgba(0, 0, 0, 0.1); - max-width: 500px; - padding: 1em; + border-top: 1px solid #ddd; font-size: 1.25em; } -.main.resource form label { +label { + clear: left; display: block; - margin-bottom: 0.25em; + float: left; + font-weight: normal; + background: white; + margin-top: 1em; + margin-right: 0.5em; + margin-bottom: 1em; + width: 10em; color: rgba(0, 0, 0, 0.75); } +.property label { + border-bottom: 1px solid #000; +} .main.resource form .property { margin: 1em 0; } -.main.resource form input { +.main.resource form input, +.main.resource form textarea { display: block; - font-size: 1.25em; + float: left; + width: 20em; + font-size: 1.0em; + color: #000; + border: 1px solid #333; min-height: 2em; padding: 0 0.5em; + margin-bottom: 1em; } +.main.resource form textarea { + height: 15em; +} .main.resource form button { - font-size: 1.25em; - float: right; + float: left; + padding: 0.5em; + font-size: 1.0em; } .clear { diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid index 86915a4..3af59fd 100644 --- a/themes/okadmin/templates/partials/head.liquid +++ b/themes/okadmin/templates/partials/head.liquid @@ -7,7 +7,7 @@ </head> <body> <header class="admin-header"> - <span class="breadcrumb">Admin</span> + <span class="breadcrumb"><b>{{meta.title}}</b> Admin</span> <a class="site-link" href="/">View Site</a> </header> <div class="container"> diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid index 9c1b71c..2a6d2ce 100644 --- a/themes/okadmin/templates/resource.liquid +++ b/themes/okadmin/templates/resource.liquid @@ -1,13 +1,15 @@ {% include 'partials/head' %} +<nav> + <a href="../..">Back</a> +</nav> + <section class="resource main"> - <nav> - <a href="../..">Back</a> - </nav> + <h2>EDIT {{ resource.type }} {{ resource.spec.title.id }}</h2> <form action="." method="POST"> <input type="hidden" name="_method" value="PUT"> {% include 'partials/inputs' %} - <button type="submit">Save</button> + <label> </label><button type="submit">Save</button> <div class="clear"></div> </form> </section> diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid index 1e414be..400d670 100644 --- a/themes/okadmin/templates/resource_new.liquid +++ b/themes/okadmin/templates/resource_new.liquid @@ -1,13 +1,15 @@ {% include 'partials/head' %} +<nav> + <a href="../..">Back</a> +</nav> + <section class="main resource resource-new"> - <nav> - <a href="../..">Back</a> - </nav> + <h2>NEW {{ resource.type }}</h2> <form action=".." method="POST"> <input type="hidden" name="_method" value="POST"> {% include 'partials/inputs' %} - <button type="submit">Create</button> + <label> </label><button type="submit">Create</button> <div class="clear"></div> </form> </section> |