diff --git a/common/content/buffer.js b/common/content/buffer.js index 2563afcc..a4718b18 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -1154,7 +1154,10 @@ const Buffer = Module("buffer", { } catch (e) {} - let sel = buffer.focusedFrame.getSelection(); + try { + var sel = buffer.focusedFrame.getSelection(); + } + catch (e) {} if (!elem && sel && sel.rangeCount) elem = sel.getRangeAt(0).startContainer; if (elem) diff --git a/common/content/configbase.js b/common/content/configbase.js index 8fbcc20f..ce8d5d55 100644 --- a/common/content/configbase.js +++ b/common/content/configbase.js @@ -225,7 +225,13 @@ const ConfigBase = Class(ModuleBase, { Usage>LineInfo position: absolute; left: 100%; padding: 1ex; margin: -1ex -1em; background: rgba(255, 255, 255, .8); border-radius: 1ex; Usage:not(:hover)>LineInfo opacity: 0; left: 0; width: 1px; height: 1px; overflow: hidden; - !StatusLine color: white !important; background: black !important + !StatusLine { color: white !important; background: black !important; + min-height: 18px !important; + border: none !important; + font-weight: bold; + font-family: monospace; + -moz-appearance: none !important; + } StatusLineBroken color: black !important; background: #FFa0a0 !important /* light-red */ StatusLineSecure color: black !important; background: #a0a0FF !important /* light-blue */ StatusLineExtended color: black !important; background: #a0FFa0 !important /* light-green */ @@ -290,7 +296,7 @@ const ConfigBase = Class(ModuleBase, { HelpBorder;*;dactyl://help/* border-color: silver; border-width: 0px; border-style: solid; HelpCode display: block; white-space: pre; margin-left: 2em; font-family: monospace; - HelpDefault display: inline-block; margin-right: 1ex; white-space: pre; + HelpDefault display: inline-block; margin-right: 1ex; white-space: pre; vertical-align: text-top; HelpDescription display: block; clear: right; HelpDescription[short] clear: none; @@ -319,9 +325,11 @@ const ConfigBase = Class(ModuleBase, { padding-right: 13px; } - HelpOrderedList;ol[level="1"],ol;dactyl://help/* display: block; list-style: outside decimal; - HelpOrderedList2;ol[level="2"],ol ol;dactyl://help/* list-style: outside upper-alpha; - HelpOrderedList3;ol[level="3"],ol ol ol;dactyl://help/* list-style: outside lower-roman; + HelpOrderedList;ol;dactyl://help/* + HelpOrderedList1;ol[level="1"],ol;dactyl://help/* list-style: outside decimal; display: block; + HelpOrderedList2;ol[level="2"],ol ol;dactyl://help/* list-style: outside upper-alpha; + HelpOrderedList3;ol[level="3"],ol ol ol;dactyl://help/* list-style: outside lower-roman; + HelpOrderedList4;ol[level="4"],ol ol ol ol;dactyl://help/* list-style: outside decimal; HelpList;html|ul;dactyl://help/* display: block; list-style: outside disc; HelpListItem;html|li;dactyl://help/* display: list-item; diff --git a/common/content/events.js b/common/content/events.js index f1c1e117..8eb3b23e 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -678,7 +678,7 @@ const Events = Module("events", { if (dactyl.focusedElement) { let rect = dactyl.focusedElement.getBoundingClientRect(); if (!rect.width || !rect.height) { - services.focusManager.clearFocus(window); + services.focus.clearFocus(window); // onFocusChange needs to die. this.onFocusChange(); } diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css index 5e90659c..479ed0d1 100644 --- a/common/skin/dactyl.css +++ b/common/skin/dactyl.css @@ -130,25 +130,12 @@ label[collapsed=true] { } /* fixes the min-height: 22px from firefox */ -#status-bar, statusbarpanel { -moz-appearance: none !important; min-height: 18px !important; - border: none !important; - font-weight: bold; - font-family: monospace; + background: transparent; } -#dactyl-statusline { - font-family: monospace; - margin: 0px; -} -#dactyl-statusline > label { - padding: 0px 0px 0px 8px; -} -#dactyl-statusline > label:first-child { - padding: 0px; -} #dactyl-statusline-field-url { background-color: inherit; color: inherit;