From a4ef761ffe521e3d17b102a0b9352ba1b3b40136 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Tue, 3 Jul 2018 21:30:11 -0700 Subject: [PATCH] convert rem(s) to pixels --- modules/ui/components/Folder.less | 4 ++-- modules/ui/components/Menu.less | 12 ++++++------ modules/ui/components/Stack.less | 2 +- modules/ui/components/TabSwitcher.less | 2 +- modules/ui/components/Toolbar.less | 10 +++++----- modules/ui/components/Window.less | 4 ++-- modules/ui/components/controls/ButtonGroup.less | 2 +- modules/ui/components/controls/InputControl.less | 2 +- modules/ui/components/controls/RadioButtons.less | 2 +- modules/ui/styles/init/main.less | 2 +- web/app/cad/craft/wizard/components/Wizard.less | 2 +- web/app/cad/dom/actionInfo/ActionInfo.less | 4 ++-- web/app/cad/dom/components/ControlBar.less | 2 +- web/app/cad/dom/components/OperationHistory.less | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/ui/components/Folder.less b/modules/ui/components/Folder.less index b511cf7a..92428f06 100644 --- a/modules/ui/components/Folder.less +++ b/modules/ui/components/Folder.less @@ -7,11 +7,11 @@ .title { border-bottom: 1px solid @border-color; background-color: @bg-color; - padding: 0.3rem 0.6rem; + padding: 3px 6px; line-height: 1.7; } .handle { - font-size: 0.8rem; + font-size: 8px; color: @font-color-suppressed; } \ No newline at end of file diff --git a/modules/ui/components/Menu.less b/modules/ui/components/Menu.less index 760fd0cd..2dc3dad4 100644 --- a/modules/ui/components/Menu.less +++ b/modules/ui/components/Menu.less @@ -1,11 +1,11 @@ @import '../styles/theme.less'; .root { - padding: 0.5rem 0; + padding: 5px 0; } .item { - padding: 0.5rem 0.6rem 0.5rem 0.5rem; + padding: 5px 6px 5px 5px; cursor: pointer; text-transform: capitalize; white-space: nowrap; @@ -26,15 +26,15 @@ & .hotKey { color: @font-color-suppressed; - font-size: 0.9rem; - padding-left: 1.4rem; + font-size: 9px; + padding-left: 14px; flex-grow: 1; text-align: right; } & .label { - padding-left: 0.5rem; - padding-right: 0.3rem; + padding-left: 5px; + padding-right: 3px; } } diff --git a/modules/ui/components/Stack.less b/modules/ui/components/Stack.less index 9cbd5e2d..55e77344 100644 --- a/modules/ui/components/Stack.less +++ b/modules/ui/components/Stack.less @@ -3,6 +3,6 @@ .root > * { border-bottom: 1px solid @border-color; - padding: 0.3rem 0.6rem; + padding: 3px 6px; line-height: 1.7; } diff --git a/modules/ui/components/TabSwitcher.less b/modules/ui/components/TabSwitcher.less index 0d48a3de..6de7e158 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.4rem 0.4rem 0.4rem 0.7rem; + padding: 4px 4px 4px 7px; cursor: pointer; border-right: @border; display: inline-block; diff --git a/modules/ui/components/Toolbar.less b/modules/ui/components/Toolbar.less index d3a88138..2f6860e8 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.3rem; + padding: 3px; border-radius: 5px; display: flex; } @@ -15,8 +15,8 @@ border-radius: 5px; text-align: center; white-space: nowrap; - font-size: 1rem; - padding: 0.3rem 0.7rem; + font-size: 10px; + padding: 3px 7px; color: #555; &:hover { @@ -36,8 +36,8 @@ } .small > * { - font-size: 1.6rem; - padding: 0.5rem 0.2rem; + font-size: 16px; + padding: 5px 2px; } diff --git a/modules/ui/components/Window.less b/modules/ui/components/Window.less index 95ba1c4f..b2ab6e68 100644 --- a/modules/ui/components/Window.less +++ b/modules/ui/components/Window.less @@ -17,12 +17,12 @@ line-height: 1; cursor: default; border-bottom: 1px solid @border-color; - padding-left: 0.6rem; + padding-left: 6px; } .button { display: inline-block; - padding: 0.6rem 0.5rem 0.6rem 0.5rem; + padding: 6px 5px 6px 5px; .button-behavior(@color-danger); } diff --git a/modules/ui/components/controls/ButtonGroup.less b/modules/ui/components/controls/ButtonGroup.less index b7b7bbe6..b09c6edb 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.5rem; + margin-left: 5px; } } diff --git a/modules/ui/components/controls/InputControl.less b/modules/ui/components/controls/InputControl.less index 61fba4d9..cf870dd5 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.2rem; + padding: 2px; &:focus { border: #444 1px solid; } diff --git a/modules/ui/components/controls/RadioButtons.less b/modules/ui/components/controls/RadioButtons.less index 4bac4c6a..d9291cd6 100644 --- a/modules/ui/components/controls/RadioButtons.less +++ b/modules/ui/components/controls/RadioButtons.less @@ -1,3 +1,3 @@ .radioButton { - margin-left: 1rem; + margin-left: 1px; } \ No newline at end of file diff --git a/modules/ui/styles/init/main.less b/modules/ui/styles/init/main.less index b352e179..809fe5b4 100644 --- a/modules/ui/styles/init/main.less +++ b/modules/ui/styles/init/main.less @@ -8,7 +8,7 @@ html { body { background-color: @bg-color; color: @font-color; - font-size: 1.1rem; + font-size: 11px; } iframe { diff --git a/web/app/cad/craft/wizard/components/Wizard.less b/web/app/cad/craft/wizard/components/Wizard.less index 830281d5..a16baad4 100644 --- a/web/app/cad/craft/wizard/components/Wizard.less +++ b/web/app/cad/craft/wizard/components/Wizard.less @@ -3,7 +3,7 @@ } .userErrorMessage, .errorCode { - font-size: 0.9rem; + font-size: 9px; } .userErrorMessage { diff --git a/web/app/cad/dom/actionInfo/ActionInfo.less b/web/app/cad/dom/actionInfo/ActionInfo.less index 6ce84f84..7fa46066 100644 --- a/web/app/cad/dom/actionInfo/ActionInfo.less +++ b/web/app/cad/dom/actionInfo/ActionInfo.less @@ -3,11 +3,11 @@ .root { display: flex; pointer-events:none; - padding: 0.2rem 0.5rem; + padding: 2px 5px; max-width: 400px; color: @font-color-minor; & > * { - padding: 0.3rem 0; + padding: 3px 0; } } diff --git a/web/app/cad/dom/components/ControlBar.less b/web/app/cad/dom/components/ControlBar.less index 652b0297..d2f946d0 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.5rem 0.5rem 0.4rem 0.5rem; + padding: 5px 5px 4px 5px; &:hover { background-color: @work-area-control-bar-bg-color-active; diff --git a/web/app/cad/dom/components/OperationHistory.less b/web/app/cad/dom/components/OperationHistory.less index e5513396..7cee7323 100644 --- a/web/app/cad/dom/components/OperationHistory.less +++ b/web/app/cad/dom/components/OperationHistory.less @@ -18,9 +18,9 @@ .buttons { display: none; - font-size: 1.3rem; + font-size: 13px; & > * { - padding: 0 0.3rem; + padding: 0 3px; &.danger:hover { color: red; }