button styles

5 files changed, 29 insertions, 14 deletions

diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index f0069d0..24f7100 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -170,11 +170,22 @@ h2 {
     font-family: Roboto, sans-serif;
 }
 
-.main.index .resource-category .btn {
+.btn {
+    text-transform: lowercase;
     font-family: Roboto, sans-serif;
 }
 
-.main.index .resource-category .btn:hover {}
+.btn:hover,
+.main.index .resource-category nav a:hover,
+.add-image-button:hover button {
+    color: white;
+    background: #ddd;
+}
+
+.main.resource form button[type="submit"]:hover,
+.main.index .resource-category nav a.btn.add-btn:hover {
+    background: #666;
+}
 
 .add-btn:after {
     content: " Add Item";
@@ -361,13 +372,14 @@ input[type=submit] {
 
 .main.resource form#delete_form button {
     float: right;
-    background:red;
+    color: white;
+    background: red;
     margin-bottom: 50px
 }
 
-
 .main.resource form#delete_form button:hover {
-    background:black;
+    background: #ddd;
+    color: red;
 }
 .main.resource form button[type="submit"]{
   background: black;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 9891298..1a7c8e7 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -133,6 +133,9 @@ var OKAdmin = function(){
   // make the region sortable with drag-and-drop
   $(".media-list ol, .image-list ol, .link-list .links").sortable()
   $(".media-list ol, .image-list ol").disableSelection()
+  $(document).on("click", ".main.index .resource-category.active ol a", function(e){
+    e.preventDefault()
+  })
 
   // populate a video field with info from our url parser
   var last_url
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 71856cc..19aa3a1 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -102,7 +102,7 @@
                   type="text"
                   placeholder="URL"
                   class="link-input link-uri">
-              <button class="remove-link-btn">
+              <button class="remove-link-btn btn">
                 -
               </button>
             </li>
@@ -115,7 +115,7 @@
         <input type="text"
                class="link-input-new link-uri"
                placeholder="http://www.example.com">
-        <button class="add-link-btn">+</button>
+        <button class="add-link-btn btn">+</button>
 
         <script type="text/html" class="link-template">
           <li>
@@ -132,7 +132,7 @@
                 type="text"
                 placeholder="URL"
                 class="link-input link-uri">
-            <button class="remove-link-btn">
+            <button class="remove-link-btn btn">
               -
             </button>
           </li>
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index 88f93bd..6af08b9 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -3,9 +3,9 @@
 {% include 'partials/flash' %}
 
 <nav class="resource-nav">
-  <a href="../..">Back</a><br>
+  <a href="../.." class="btn">Back</a><br>
   <br>
-  <a href="/admin/{{ resource.type }}/__new__/">ADD ANOTHER</a>
+  <a href="/admin/{{ resource.type }}/__new__/" class="btn">ADD ANOTHER</a>
 </nav>
 
 <section class="resource main" data-type="{{ resource.type }}" data-id="{{ resource.id }}">
@@ -13,12 +13,12 @@
   <form action="." method="POST" id="resource_form">
     <input type="hidden" name="_method" value="PUT">
     {% include 'partials/inputs' %}
-    <label>&nbsp;</label><button type="submit">Save</button>
+    <label>&nbsp;</label><button type="submit" class="btn">Save</button>
     <div class="clear"></div>
   </form>
   <form action="." method="POST" id="delete_form">
     <input type="hidden" name="_method" value="DELETE">
-    <button type="submit">Delete Record</button>
+    <button type="submit" class="btn">Delete Record</button>
   </form>
 </section>
 
diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid
index 15d13ba..fbd9785 100644
--- a/themes/okadmin/templates/resource_new.liquid
+++ b/themes/okadmin/templates/resource_new.liquid
@@ -3,7 +3,7 @@
 {% include 'partials/flash' %}
 
 <nav class="resource-nav">
-  <a href="../..">Back</a>
+  <a href="../.." class="btn">Back</a>
 </nav>
 
 <section class="main resource resource-new">
@@ -11,7 +11,7 @@
   <form action=".." method="POST" id="resource_form">
     <input type="hidden" name="_method" value="POST">
     {% include 'partials/inputs' %}
-    <label>&nbsp;</label><button type="submit">Create</button>
+    <label>&nbsp;</label><button type="submit" class="btn">Create</button>
     <div class="clear"></div>
   </form>
 </section>