diff --git a/modules/ui/components/Menu.less b/modules/ui/components/Menu.less index dfad12d9..73eabe5d 100644 --- a/modules/ui/components/Menu.less +++ b/modules/ui/components/Menu.less @@ -1,11 +1,11 @@ @import '../styles/theme'; .root { - padding: 0.45em 0; + padding: 0.5rem 0; } .item { - padding: 0.45em 0.55em 0.45em 0.45em; + padding: 0.5rem 0.6rem 0.5rem 0.5rem; cursor: pointer; text-transform: capitalize; white-space: nowrap; @@ -26,15 +26,15 @@ & .hotKey { color: @font-color-suppressed; - font-size: 0.8em; - padding-left: 1.5em; + font-size: 0.9rem; + padding-left: 1.4rem; flex-grow: 1; text-align: right; } & .label { - padding-left: 0.45em; - padding-right: 0.25em; + padding-left: 0.5rem; + padding-right: 0.3rem; } } diff --git a/modules/ui/components/Stack.less b/modules/ui/components/Stack.less index ac23969c..9cc100dd 100644 --- a/modules/ui/components/Stack.less +++ b/modules/ui/components/Stack.less @@ -4,6 +4,6 @@ .root > * { border-bottom: 1px solid @border-color; - padding: 0.3em 0.5em; + padding: 0.3rem 0.6rem; } diff --git a/modules/ui/components/TabSwitcher.less b/modules/ui/components/TabSwitcher.less index 0c95022d..6ce2da85 100644 --- a/modules/ui/components/TabSwitcher.less +++ b/modules/ui/components/TabSwitcher.less @@ -7,7 +7,7 @@ .tab { @border: 1px solid @border-color; - padding: 0.3em 0.3em 0.4em 0.6em; + padding: 0.4rem 0.4rem 0.4rem 0.7rem; cursor: pointer; border-right: @border; display: inline-block; diff --git a/modules/ui/components/Toolbar.less b/modules/ui/components/Toolbar.less index c3d4f32e..fabeca03 100644 --- a/modules/ui/components/Toolbar.less +++ b/modules/ui/components/Toolbar.less @@ -2,7 +2,7 @@ .root { background-color: rgba(255, 255, 255, 0.5); - padding: 0.3em; + padding: 0.3rem; border-radius: 5px; } @@ -10,8 +10,8 @@ border-radius: 5px; text-align: center; white-space: nowrap; - font-size: 0.9em; - padding: 0.3em 0.1em; + font-size: 1rem; + padding: 0.3rem 0.1rem; color: #555; &:hover { @@ -31,7 +31,8 @@ } .small > * { - font-size: 1.5em; + font-size: 1.6rem; + padding: 0.5rem 0.2rem; } diff --git a/modules/ui/components/Window.less b/modules/ui/components/Window.less index d7b43458..33fb2ba5 100644 --- a/modules/ui/components/Window.less +++ b/modules/ui/components/Window.less @@ -14,11 +14,11 @@ line-height: 1; cursor: default; border-bottom: 1px solid @border-color; - padding-left: 0.5em; + padding-left: 0.6rem; } .button { display: inline-block; - padding: 0.5em 0.5em 0.6em 0.5em; + padding: 0.6rem 0.5rem 0.6rem 0.5rem; .button-behavior(@color-danger); } diff --git a/modules/ui/components/controls/ButtonGroup.less b/modules/ui/components/controls/ButtonGroup.less index 9f65ccb4..b7b7bbe6 100644 --- a/modules/ui/components/controls/ButtonGroup.less +++ b/modules/ui/components/controls/ButtonGroup.less @@ -2,7 +2,7 @@ display: flex; justify-content: flex-end; & > * { - margin-left: 0.5em; + margin-left: 0.5rem; } } diff --git a/modules/ui/components/controls/InputControl.less b/modules/ui/components/controls/InputControl.less index cc54ff2f..63747e82 100644 --- a/modules/ui/components/controls/InputControl.less +++ b/modules/ui/components/controls/InputControl.less @@ -13,7 +13,7 @@ background: @bg; outline: none; border: @bg 1px solid; - padding: 0.2em; + padding: 0.2rem; &:focus { border: #444 1px solid; } diff --git a/modules/ui/styles/init/main.less b/modules/ui/styles/init/main.less index 28df78f1..30810213 100644 --- a/modules/ui/styles/init/main.less +++ b/modules/ui/styles/init/main.less @@ -1,14 +1,14 @@ @import "../theme"; @import "../mixins"; +html { + font: 10px 'Lucida Grande', sans-serif; +} + body { background-color: @bg-color; color: @font-color; - font: 11px 'Lucida Grande', sans-serif; -} - -table { - font-size: 1em; + font-size: 1.1rem; } iframe { diff --git a/web/app/brep/debug/debugger/brepDebugger.less b/web/app/brep/debug/debugger/brepDebugger.less index 96658745..8c184e7d 100644 --- a/web/app/brep/debug/debugger/brepDebugger.less +++ b/web/app/brep/debug/debugger/brepDebugger.less @@ -1,6 +1,6 @@ :global #brep-debugger { - font-size: 1.2em; + font-size: 1.2rem; position: absolute; z-index: 998; left:10px; @@ -12,7 +12,7 @@ box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); color: #1a1a1a; & .tool-caption { - padding: 0.3em; + padding: 0.4rem; background-color: rgb(238, 255, 246); cursor: default; user-select: none @@ -34,11 +34,11 @@ visibility: hidden; } - padding: 0.3em; + padding: 0.4rem; line-height: 1.5; button { font-size: inherit; - padding: 0 0.3em; + padding: 0 0.4rem; } & .operands-veiew { @@ -90,7 +90,7 @@ } } .button { - font-size: 1.3em; + font-size: 1.7rem; .clickable; } } diff --git a/web/app/cad/dom/actionInfo/ActionInfo.jsx b/web/app/cad/dom/actionInfo/ActionInfo.jsx index 85825bbd..29502be6 100644 --- a/web/app/cad/dom/actionInfo/ActionInfo.jsx +++ b/web/app/cad/dom/actionInfo/ActionInfo.jsx @@ -7,7 +7,7 @@ import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin'; import {TOKENS as KeyboardTokens} from '../../keyboard/keyboardPlugin'; function ActionInfo({actionId, x, y, info, hint, hotKey}) { - let visible = !!actionId; + let visible = !!(actionId && (info || hint || hotKey)); return diff --git a/web/app/cad/dom/components/ControlBar.less b/web/app/cad/dom/components/ControlBar.less index fd3d294d..4f0ec77f 100644 --- a/web/app/cad/dom/components/ControlBar.less +++ b/web/app/cad/dom/components/ControlBar.less @@ -15,7 +15,7 @@ .button { cursor: pointer; - padding: 0.5em 0.5em 0.35em 0.5em; + padding: 0.5rem 0.5rem 0.4rem 0.5rem; &:hover { background-color: @work-area-control-bar-bg-color-active; diff --git a/web/app/cad/dom/components/View3d.less b/web/app/cad/dom/components/View3d.less index 881c6438..fddae37c 100644 --- a/web/app/cad/dom/components/View3d.less +++ b/web/app/cad/dom/components/View3d.less @@ -16,5 +16,5 @@ } .leftToolbarGroup > * { - margin-bottom: 0.8em; + margin-bottom: 0.9rem; } diff --git a/web/app/cad/dom/components/WebApplication.jsx b/web/app/cad/dom/components/WebApplication.jsx index deccc34b..488f2913 100644 --- a/web/app/cad/dom/components/WebApplication.jsx +++ b/web/app/cad/dom/components/WebApplication.jsx @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import 'ui/styles/init/minireset.css'; import 'ui/styles/init/main.less'; -import '../../../../css/app3d-legacy.less'; import AppTabs from "./AppTabs"; diff --git a/web/css/app3d-legacy.less b/web/css/app3d-legacy.less index ae25bfe9..20cc7784 100644 --- a/web/css/app3d-legacy.less +++ b/web/css/app3d-legacy.less @@ -132,7 +132,7 @@ .modification-button { line-height: 27px; - font-size: 1.3em; + font-size: 1.3rem; padding: 0 3px 0 3px; &:hover { color: yellowgreen;