From d23595aa0256cbf26f4b9c796d05d1e5e746e5f3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 05:59:56 -0500
Subject: [PATCH] [bootstrapped] Fix some CSS issues after restartless reload.

--HG--
branch : bootstrapped
---
 common/content/commandline.js |  8 ++++----
 common/content/configbase.js  | 12 ++++++------
 common/content/statusline.js  | 19 +++++++++----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 65452b92..eb414c9f 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -55,12 +55,12 @@ const CommandWidgets = Class("CommandWidgets", {
                                 onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
                     </vbox>
 
-                    <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" dactyl:highlight="CmdLine CmdCmdLine">
+                    <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" highlight="CmdLine CmdCmdLine">
                         <textbox class="plain" id="dactyl-strut"   flex="1" crop="end" collapsed="true"/>
                         <textbox class="plain" id="dactyl-mode"    flex="1" crop="end"/>
                         <textbox class="plain" id="dactyl-message" flex="1" readonly="true"/>
 
-                        <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal CmdNormal" collapsed="true">
+                        <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" highlight="Normal CmdNormal" collapsed="true">
                             <label   id="dactyl-commandline-prompt"  class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
                             <textbox id="dactyl-commandline-command" class="dactyl-commandline-command plain" flex="1" type="input" timeout="100"
                                      oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
@@ -68,9 +68,9 @@ const CommandWidgets = Class("CommandWidgets", {
                         </hbox>
                     </stack>
 
-                    <vbox class="dactyl-container" hidden="false" collapsed="false" dactyl:highlight="CmdLine">
+                    <vbox class="dactyl-container" hidden="false" collapsed="false" highlight="CmdLine">
                         <textbox id="dactyl-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
-                                 dactyl:highlight="Normal"
+                                 highlight="Normal"
                                  onkeypress={_commandline + ".onMultilineInputEvent(event);"} oninput={_commandline + ".onMultilineInputEvent(event);"}
                                  onblur={_commandline + ".onMultilineInputEvent(event);"}/>
                     </vbox>
diff --git a/common/content/configbase.js b/common/content/configbase.js
index a6a09386..63ff9c75 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -177,8 +177,8 @@ const ConfigBase = Class(ModuleBase, {
         CmdQuestion;[dactyl|highlight]   &#x0d; StatusQuestion;[dactyl|highlight]
         CmdWarningMsg;[dactyl|highlight] &#x0d; StatusWarningMsg;[dactyl|highlight]
 
-        !Normal           color: black   !important; background: white   !important; font-weight: normal !important;
-        !StatusNormal     color: inherit !important; background: inherit !important;
+        Normal            color: black   !important; background: white   !important; font-weight: normal !important;
+        StatusNormal      color: inherit !important; background: inherit !important;
         ErrorMsg          color: white   !important; background: red     !important; font-weight: bold !important;
         InfoMsg           color: black   !important; background: white   !important;
         StatusInfoMsg     color: inherit !important; background: inherit !important;
@@ -188,7 +188,7 @@ const ConfigBase = Class(ModuleBase, {
         MoreMsg           color: green   !important; background: white   !important;
         StatusMoreMsg                                background: inherit !important;
         Message           white-space: pre-wrap !important; min-width: 100%; width: 100%; padding-left: 4em; text-indent: -4em; display: block;
-        !Message String   white-space: pre-wrap;
+        Message String    white-space: pre-wrap;
         NonText           color: blue; background: transparent !important;
         *Preview          color: gray;
         Question          color: green   !important; background: white   !important; font-weight: bold !important;
@@ -196,7 +196,7 @@ const ConfigBase = Class(ModuleBase, {
         WarningMsg        color: red     !important; background: white   !important;
         StatusWarningMsg  color: red     !important; background: inherit !important;
 
-        !CmdLine;>*       font-family: monospace !important; padding: 1px !important;
+        CmdLine;>*        font-family: monospace !important; padding: 1px !important;
         CmdPrompt;.dactyl-commandline-prompt
         CmdInput;.dactyl-commandline-command
         CmdOutput         white-space: pre;
@@ -245,8 +245,8 @@ 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         font-weight: bold; font-family: monospace; -moz-appearance: none !important; border: 0px !important; min-height: 18px !important;
-        !StatusLineNormal   color: white !important; background: black   !important;
+        StatusLine          font-weight: bold; font-family: monospace; -moz-appearance: none !important; border: 0px !important; min-height: 18px !important;
+        StatusLineNormal    color: white !important; background: black   !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 */
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 22541a22..2bf6f14c 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -26,20 +26,19 @@ const StatusLine = Module("statusline", {
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
-            <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
+            <statusbar id="status-bar" highlight="StatusLine StatusNormal">
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
-                <hbox
-                      style="background: inherit;" key="container" flex="1" hidden="false" align="center">
-                    <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                        <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                            <label class="plain" key="mode"          crop="end" collapsed="true"/>
-                            <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                                <textbox key="url"     crop="end" flex="1" readonly="true" class="plain dactyl-status-field-url"/>
-                                <textbox key="message" crop="end" flex="1" readonly="true" class="plain" dactyl:highlight="Normal StatusNormal"/>
+                <hbox style="background: inherit;" key="container"  flex="1" hidden="false" align="center">
+                    <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                        <hbox                                                class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                            <label key="mode"          crop="end"            class="plain" collapsed="true"/>
+                            <stack flex="1"                                  class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                                <textbox key="url"     crop="end"   flex="1" class="plain dactyl-status-field-url" readonly="true"/>
+                                <textbox key="message" crop="end"   flex="1" class="plain"            highlight="Normal StatusNormal" readonly="true"/>
                             </stack>
                         </hbox>
 
-                        <hbox key="commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
+                        <hbox key="commandline" hidden="false" class="dactyl-container" highlight="Normal StatusNormal" collapsed="true">
                             <label key="commandline-prompt"    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
                             <textbox key="commandline-command" class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
                                      oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}