From a8548c44ac08ce2aa41102494d4c0a9ba81a4023 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 29 Sep 2016 18:07:55 -0400 Subject: additional edits --- themes/okadmin/public/css/main.css | 16 +++++++++------- themes/okadmin/public/js/app.js | 8 ++++---- themes/okadmin/templates/resource.liquid | 6 +++--- themes/okadmin/templates/resource_new.liquid | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css index 73b2727..bf139a3 100644 --- a/themes/okadmin/public/css/main.css +++ b/themes/okadmin/public/css/main.css @@ -142,7 +142,7 @@ h2 { } .main.index .resource-category nav a:last-child { - background: #333; + background: #000; color: white; } @@ -164,7 +164,7 @@ h2 { /* Makes the button look like a link */ .main.index .resource-category button { - background: #333; + background: #000; color: white; border: none; padding: 10px; @@ -181,13 +181,15 @@ h2 { .btn:hover, .main.index .resource-category nav a:hover, .add-image-button:hover button { - color: white; - background: #bbb; + color: #fff; + background: #888; } +.main.index .resource-category button:hover, .main.resource form button[type="submit"]:hover, .main.index .resource-category nav a.btn.add-btn:hover { background: #000; + color: #ff8; } .add-btn:after { @@ -385,9 +387,9 @@ input[type=submit] { color: red; } .main.resource form button[type="submit"]{ - background: #333; - font-size: 17px; - padding:10px; + background: #000; + font-size: 17px; + padding:10px; } .main.resource form ol { margin: 0; diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js index 1a7c8e7..db900fc 100644 --- a/themes/okadmin/public/js/app.js +++ b/themes/okadmin/public/js/app.js @@ -236,11 +236,11 @@ var OKAdmin = function(){ // Modify flags checkboxes such that unchecked ones return "false" // instead of nothing $('.property input[type=checkbox]').each(function(i, el) { - var checked = !!el.checked - if (!checked) { - el.value = 'false' - el.setAttribute('checked', true) + var checked = !! el.checked + if (! checked) { + el.setAttribute('value', 'false') } + el.checked = true }) $(".link-list").each(function(){ diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid index 6af08b9..f7552ef 100644 --- a/themes/okadmin/templates/resource.liquid +++ b/themes/okadmin/templates/resource.liquid @@ -3,13 +3,13 @@ {% include 'partials/flash' %}
-

EDIT {{ resource.type }} '{{ resource.spec.title.value }}'

+

Edit {{ resource.type }} '{{ resource.spec.title.value }}'

{% include 'partials/inputs' %} diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid index fbd9785..cc15637 100644 --- a/themes/okadmin/templates/resource_new.liquid +++ b/themes/okadmin/templates/resource_new.liquid @@ -7,7 +7,7 @@
-

NEW {{ resource.type }}

+

New {{ resource.type }}

{% include 'partials/inputs' %} -- cgit v1.2.3-70-g09d2