From 1797b50847407ab261f563f3625e3b6d7076fb88 Mon Sep 17 00:00:00 2001 From: Arpad Csanyi Date: Mon, 14 Mar 2016 09:37:38 +0100 Subject: [PATCH] Macro edition interface title theming+functionality. #7 The migration of the macro theming will come after. --- app.js | 6 +++++- css/app.css | 6 ++++-- sass/app.scss | 4 ++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 816b4142..3048f161 100644 --- a/app.js +++ b/app.js @@ -7,9 +7,13 @@ $(function() { // ======================== // Keymap related settings. // ======================== - $('.keymap__name, .keymap__abbrev').on('mouseover', function() { + $('.keymap__name, .keymap__abbrev, .macro__name').on('mouseover', function() { $(this).addClass('active'); }).on('mouseout', function() { + if (!$(this).is(':focus')) { + $(this).removeClass('active'); + } + }).on('focusout', function() { $(this).removeClass('active'); }); diff --git a/css/app.css b/css/app.css index df776f50..a7aeb182 100644 --- a/css/app.css +++ b/css/app.css @@ -89,16 +89,20 @@ li { .pane-title { margin-bottom: 1em; } +.macro__name.active, .keymap__name.active, .keymap__abbrev.active { box-shadow: 0 0 0px 1px #ccc, 0 0 5px 0px #ccc; border-color: transparent; } +.macro__name, .keymap__name, .keymap__abbrev { border: none; border-bottom: 2px dotted #999; } +.macro__name, +.macro__name.active, .keymap__name, .keymap__name.active, .keymap__abbrev, @@ -139,5 +143,3 @@ li { .sidebar__level-1:hover .fa.fa-chevron-down, .sidebar__level-1:hover .fa.fa-chevron-up { display: inline-block; } - -/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmNzcyIsInNvdXJjZXMiOlsiYXBwLnNjc3MiXSwic291cmNlc0NvbnRlbnQiOlsiI3NpZGViYXItbWVudSB7XG4gIGJhY2tncm91bmQtY29sb3I6ICNmNWY1ZjU7XG4gIGJvcmRlci1yaWdodDogMXB4IHNvbGlkICNjY2M7XG4gIHBvc2l0aW9uOiBmaXhlZDtcbiAgb3ZlcmZsb3cteTogYXV0bztcbiAgd2lkdGg6IDI1MHB4O1xuICBoZWlnaHQ6IDEwMCU7XG59XG5cbnVsIHtcbiAgcGFkZGluZzogMDtcbiAgbWFyZ2luOiAwO1xufVxuXG5saSB7XG4gIGxpc3Qtc3R5bGU6IG5vbmU7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi5zaWRlYmFyX19sZXZlbC0xIHtcbiAgcGFkZGluZzogLjVyZW0gMXJlbTtcbn1cblxuLnNpZGViYXJfX2xldmVsLTEsIC5zaWRlYmFyX19sZXZlbC0yIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xufVxuXG4uc2lkZWJhcl9fbGV2ZWwtMiB7XG4gIG1hcmdpbi1sZWZ0OiAxNXB4O1xufVxuXG4uc2lkZWJhcl9fbGV2ZWwtMTpob3Zlcixcbi5zaWRlYmFyX19sZXZlbC0yLS1pdGVtOmhvdmVyIHtcbiAgY3Vyc29yOiBwb2ludGVyO1xuICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDUpO1xufVxuXG4jc2lkZWJhci1tZW51IC5zaWRlYmFyX19sZXZlbC0yLS1pdGVtIHtcbiAgcGFkZGluZzogMCAyMHB4IDAgMDtcbn1cblxuI3NpZGViYXItbWVudSAuc2lkZWJhcl9fbGV2ZWwtMi0taXRlbSAuZmEucHVsbC1yaWdodCB7XG4gIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgdG9wOiAycHg7XG59XG5cbiNzaWRlYmFyLW1lbnUgLmZhLXN0YXItbyB7XG4gIGNvbG9yOiAjZjVmNWY1O1xufVxuXG4jc2lkZWJhci1tZW51IC5zaWRlYmFyX19sZXZlbC0yLS1pdGVtOmhvdmVyIC5mYS1zdGFyLW8ge1xuICBjb2xvcjogIzAwMDtcbn1cblxuI3NpZGViYXItbWVudSAuc2lkZWJhcl9fbGV2ZWwtMi0taXRlbSAuZmEtc3Rhci1vOmhvdmVyIHtcbiAgY29sb3I6ICMwMDA7XG59XG5cbiNzaWRlYmFyLW1lbnUgLmZhLXN0YXIge1xuICBjb2xvcjogIzY2Njtcbn1cblxuLnNpZGViYXJfX2xldmVsLTEge1xuICBmb250LXNpemU6IDJyZW07XG4gIGxpbmUtaGVpZ2h0OiAzcmVtO1xufVxuXG4uc2lkZWJhcl9fbGV2ZWwtMS0taXRlbSB7XG4gIG1hcmdpbi10b3A6IDA7XG59XG5cbi5zaWRlYmFyX19sZXZlbC0xLS1pdGVtOm50aC1jaGlsZCgxKSB7XG4gIG1hcmdpbjogMDtcbn1cblxuI3NpZGViYXItbWVudSAuc2lkZWJhcl9fYWN0aW9ucy0tbGlzdCB7XG4gIG1hcmdpbi10b3A6IDFyZW07XG59XG5cbi5zaWRlYmFyX19hY3Rpb24tLWl0ZW0ge1xuICB0ZXh0LWFsaWduOiBjZW50ZXI7XG59XG5cbi5zaWRlYmFyX19hY3Rpb24ge1xuICB3aWR0aDogODAlO1xufVxuXG4uc2lkZWJhcl9fbGV2ZWwtMi0taXRlbS5hY3RpdmUge1xuICBiYWNrZ3JvdW5kLWNvbG9yOiAjNTU1O1xuICBjb2xvcjogI2ZmZjtcbn1cblxuLnNpZGViYXJfX2xldmVsLTItLWl0ZW0uYWN0aXZlIGkge1xuICBkaXNwbGF5OiBub25lO1xufVxuXG4ubWVudS0tYm90dG9tIHtcbiAgcG9zaXRpb246IGFic29sdXRlO1xuICBib3R0b206IDA7XG4gIGxlZnQ6IDA7XG4gIHdpZHRoOiAxMDAlO1xufVxuXG4ubWVudS0tYm90dG9tIC5zaWRlYmFyX19sZXZlbC0xIHtcbiAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7XG4gIHBhZGRpbmc6IDFyZW07XG59XG5cbiNtYWluLWNvbnRlbnQge1xuICBtYXJnaW4tbGVmdDogMjUwcHg7XG59XG5cbi5wYW5lLXRpdGxlIHtcbiAgbWFyZ2luLWJvdHRvbTogMWVtO1xufVxuXG4ua2V5bWFwX19uYW1lLmFjdGl2ZSxcbi5rZXltYXBfX2FiYnJldi5hY3RpdmUge1xuICBib3gtc2hhZG93OiAwIDAgMHB4IDFweCAjY2NjLCAwIDAgNXB4IDBweCAjY2NjO1xuICBib3JkZXItY29sb3I6IHRyYW5zcGFyZW50O1xufVxuXG4ua2V5bWFwX19uYW1lLFxuLmtleW1hcF9fYWJicmV2IHtcbiAgYm9yZGVyOiBub25lO1xuICBib3JkZXItYm90dG9tOiAycHggZG90dGVkICM5OTk7XG59XG5cbi5rZXltYXBfX25hbWUsXG4ua2V5bWFwX19uYW1lLmFjdGl2ZSxcbi5rZXltYXBfX2FiYnJldixcbi5rZXltYXBfX2FiYnJldi5hY3RpdmUge1xuICBwYWRkaW5nOiAwIC41cmVtO1xuICBtYXJnaW46IDAgLjI1cmVtO1xufVxuXG4ua2V5bWFwX19pcy1kZWZhdWx0LmZhLXN0YXIge1xuICBjb2xvcjogIzMzMztcbn1cblxuLmtleW1hcF9faXMtZGVmYXVsdC5mYS1zdGFyLW8ge1xuICBjb2xvcjogIzMzMztcbn1cblxuLmtleW1hcF9faXMtZGVmYXVsdDpob3ZlciB7XG4gIGNvbG9yOiAjNTU1O1xuICBjdXJzb3I6IHBvaW50ZXI7XG59XG5cbi51aGsge1xuICBtYXgtd2lkdGg6IDEwMCU7XG59XG5cbi5vd2wtY2Fyb3VzZWwge1xuICBtYXgtd2lkdGg6IDk5MXB4O1xuICBtYXJnaW46IGF1dG87XG59XG5cbi5vd2wtY2Fyb3VzZWwgLml0ZW0gaW1nIHtcbiAgZGlzcGxheTogYmxvY2s7XG4gIHdpZHRoOiAxMDAlO1xuICBoZWlnaHQ6IGF1dG87XG59XG5cbi5zaWRlYmFyX19sZXZlbC0xIC5mYS5mYS1jaGV2cm9uLWRvd24sXG4uc2lkZWJhcl9fbGV2ZWwtMSAuZmEuZmEtY2hldnJvbi11cCB7XG4gIG1hcmdpbi1yaWdodDogMXJlbTtcbiAgZm9udC1zaXplOiAxLjVyZW07XG4gIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgdG9wOiAuNXJlbTtcbiAgZGlzcGxheTogbm9uZTtcbn1cblxuLnNpZGViYXJfX2xldmVsLTE6aG92ZXIgLmZhLmZhLWNoZXZyb24tZG93bixcbi5zaWRlYmFyX19sZXZlbC0xOmhvdmVyIC5mYS5mYS1jaGV2cm9uLXVwIHtcbiAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxhQUFhLENBQUM7RUFDWixnQkFBZ0IsRUFBRSxPQUFRO0VBQzFCLFlBQVksRUFBRSxjQUFlO0VBQzdCLFFBQVEsRUFBRSxLQUFNO0VBQ2hCLFVBQVUsRUFBRSxJQUFLO0VBQ2pCLEtBQUssRUFBRSxLQUFNO0VBQ2IsTUFBTSxFQUFFLElBQUssR0FDZDs7QUFFRCxFQUFFLENBQUM7RUFDRCxPQUFPLEVBQUUsQ0FBRTtFQUNYLE1BQU0sRUFBRSxDQUFFLEdBQ1g7O0FBRUQsRUFBRSxDQUFDO0VBQ0QsVUFBVSxFQUFFLElBQUs7RUFDakIsT0FBTyxFQUFFLENBQUUsR0FDWjs7QUFFRCxpQkFBaUIsQ0FBQztFQUNoQixPQUFPLEVBQUUsVUFBVyxHQUNyQjs7QUFFRCxpQkFBaUIsRUFBRSxpQkFBaUIsQ0FBQztFQUNuQyxZQUFZLEVBQUUsSUFBSyxHQUNwQjs7QUFFRCxpQkFBaUIsQ0FBQztFQUNoQixXQUFXLEVBQUUsSUFBSyxHQUNuQjs7QUFFRCxpQkFBaUIsQUFBQSxNQUFNO0FBQ3ZCLHVCQUF1QixBQUFBLE1BQU0sQ0FBQztFQUM1QixNQUFNLEVBQUUsT0FBUTtFQUNoQixnQkFBZ0IsRUFBRSxtQkFBSSxHQUN2Qjs7QUFFRCxhQUFhLENBQUMsdUJBQXVCLENBQUM7RUFDcEMsT0FBTyxFQUFFLFVBQVcsR0FDckI7O0FBRUQsYUFBYSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQUFBQSxXQUFXLENBQUM7RUFDbkQsUUFBUSxFQUFFLFFBQVM7RUFDbkIsR0FBRyxFQUFFLEdBQUksR0FDVjs7QUFFRCxhQUFhLENBQUMsVUFBVSxDQUFDO0VBQ3ZCLEtBQUssRUFBRSxPQUFRLEdBQ2hCOztBQUVELGFBQWEsQ0FBQyx1QkFBdUIsQUFBQSxNQUFNLENBQUMsVUFBVSxDQUFDO0VBQ3JELEtBQUssRUFBRSxJQUFL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 */ diff --git a/sass/app.scss b/sass/app.scss index e2b5f804..b38d1a6f 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -114,18 +114,22 @@ li { margin-bottom: 1em; } +.macro__name.active, .keymap__name.active, .keymap__abbrev.active { box-shadow: 0 0 0px 1px #ccc, 0 0 5px 0px #ccc; border-color: transparent; } +.macro__name, .keymap__name, .keymap__abbrev { border: none; border-bottom: 2px dotted #999; } +.macro__name, +.macro__name.active, .keymap__name, .keymap__name.active, .keymap__abbrev,