From e100d79a376a46cfcace0ec9085d1445e5f0f0c2 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 29 Sep 2016 16:52:22 -0400 Subject: button styles --- themes/okadmin/public/css/main.css | 22 +++++++++++++++++----- themes/okadmin/public/js/app.js | 3 +++ themes/okadmin/templates/partials/inputs.liquid | 6 +++--- themes/okadmin/templates/resource.liquid | 8 ++++---- themes/okadmin/templates/resource_new.liquid | 4 ++-- 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"> - @@ -115,7 +115,7 @@ - +