summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-09-29 18:07:55 -0400
committerJules Laplace <jules@okfoc.us>2016-09-29 18:07:55 -0400
commita8548c44ac08ce2aa41102494d4c0a9ba81a4023 (patch)
tree80a673fb7222c0aaa06efd1b459e5248cb35a1f0
parentc05578b9d5cc0b69cc2a2e31cc0e36a40b09f683 (diff)
additional edits
-rw-r--r--themes/okadmin/public/css/main.css16
-rw-r--r--themes/okadmin/public/js/app.js8
-rw-r--r--themes/okadmin/templates/resource.liquid6
-rw-r--r--themes/okadmin/templates/resource_new.liquid2
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' %}
<nav class="resource-nav">
- <a href="../.." class="btn">Back</a><br>
+ <a href="../.." class="btn">back</a><br>
<br>
- <a href="/admin/{{ resource.type }}/__new__/" class="btn">ADD ANOTHER</a>
+ <a href="/admin/{{ resource.type }}/__new__/" class="btn">add&nbsp;another</a>
</nav>
<section class="resource main" data-type="{{ resource.type }}" data-id="{{ resource.id }}">
- <h2>EDIT {{ resource.type }} '{{ resource.spec.title.value }}'</h2>
+ <h2>Edit {{ resource.type }} '{{ resource.spec.title.value }}'</h2>
<form action="." method="POST" id="resource_form">
<input type="hidden" name="_method" value="PUT">
{% 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 @@
</nav>
<section class="main resource resource-new">
- <h2>NEW {{ resource.type }}</h2>
+ <h2>New {{ resource.type }}</h2>
<form action=".." method="POST" id="resource_form">
<input type="hidden" name="_method" value="POST">
{% include 'partials/inputs' %}