From 43605ce79c3bf601b71e21ef0f16676be93c5edb Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Fri, 26 Jan 2018 21:46:48 -0800 Subject: [PATCH] fix brep debugger --- web/app/brep/debug/debugger/brepDebugger.less | 21 +++++++++++++++++++ web/app/cad/debugPlugin.js | 4 ++-- web/app/cad/keyboard/keymaps/default.js | 2 +- web/css/app3d-legacy.less | 2 -- web/css/brep-debugger.less | 17 --------------- 5 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 web/css/brep-debugger.less diff --git a/web/app/brep/debug/debugger/brepDebugger.less b/web/app/brep/debug/debugger/brepDebugger.less index 394fd8d8..96658745 100644 --- a/web/app/brep/debug/debugger/brepDebugger.less +++ b/web/app/brep/debug/debugger/brepDebugger.less @@ -1,3 +1,24 @@ +:global +#brep-debugger { + font-size: 1.2em; + position: absolute; + z-index: 998; + left:10px; + top:10px; + bottom: 20px; + overflow: auto; + background: #eee; + border: 5px solid rgb(49, 121, 255); + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); + color: #1a1a1a; + & .tool-caption { + padding: 0.3em; + background-color: rgb(238, 255, 246); + cursor: default; + user-select: none + } +} + :global .brep-debugger { diff --git a/web/app/cad/debugPlugin.js b/web/app/cad/debugPlugin.js index d1717880..1cec6acf 100644 --- a/web/app/cad/debugPlugin.js +++ b/web/app/cad/debugPlugin.js @@ -303,8 +303,8 @@ const DebugActions = [ label: 'open BREP debugger', info: 'open the BREP debugger in a window', }, - invoke: ({cadScene}) => { - + invoke: ({services: {cadScene}}) => { + // require('../brep/debug/debugger/brepDebugger.less'); let debuggerWinDom = document.getElementById('brep-debugger'); if (!debuggerWinDom) { //Temporary hack until win infrastructure is done for 3d diff --git a/web/app/cad/keyboard/keymaps/default.js b/web/app/cad/keyboard/keymaps/default.js index adc090f7..e38b856c 100644 --- a/web/app/cad/keyboard/keymaps/default.js +++ b/web/app/cad/keyboard/keymaps/default.js @@ -8,5 +8,5 @@ export default { 'menu.main': 'space', 'Save': 'ctrl+S', 'Info': 'F1', - 'DebugOpenBrepDebugger': 'ctrl+B' + 'DebugOpenBrepDebugger': 'ctrl+b' }; diff --git a/web/css/app3d-legacy.less b/web/css/app3d-legacy.less index 86cf651b..ae25bfe9 100644 --- a/web/css/app3d-legacy.less +++ b/web/css/app3d-legacy.less @@ -1,5 +1,3 @@ -@import 'brep-debugger.less'; - @tab-border-color: #2c2c2c; @menu-border-radius: 3px; @suppressed-color: #888; diff --git a/web/css/brep-debugger.less b/web/css/brep-debugger.less deleted file mode 100644 index ff6a18b9..00000000 --- a/web/css/brep-debugger.less +++ /dev/null @@ -1,17 +0,0 @@ -#brep-debugger { - font-size: 1.2em; - position: absolute; - left:10px; - top:10px; - bottom: 20px; - overflow: auto; - background: #eee; - border: 5px solid rgb(49, 121, 255); - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); - & .tool-caption { - padding: 0.3em; - background-color: rgb(238, 255, 246); - cursor: default; - user-select: none - } -} \ No newline at end of file