Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-08 01:13:27 +01:00
Code Issues Projects Releases Wiki Activity

define everything in rem

Browse source
This commit is contained in:
Val Erastov 2018-01-29 01:21:46 -08:00
parent b6d5f5d287
commit 959d0890b0
14 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/ui/components/Menu.less
View file

@ -1,11 +1,11 @@
@import '../styles/theme'; @import '../styles/theme';
.root { .root {
padding: 0.45em 0; padding: 0.5rem 0;
} }
.item { .item {
padding: 0.45em 0.55em 0.45em 0.45em; padding: 0.5rem 0.6rem 0.5rem 0.5rem;
cursor: pointer; cursor: pointer;
text-transform: capitalize; text-transform: capitalize;
white-space: nowrap; white-space: nowrap;
@ -26,15 +26,15 @@
& .hotKey { & .hotKey {
color: @font-color-suppressed; color: @font-color-suppressed;
font-size: 0.8em; font-size: 0.9rem;
padding-left: 1.5em; padding-left: 1.4rem;
flex-grow: 1; flex-grow: 1;
text-align: right; text-align: right;
} }
& .label { & .label {
padding-left: 0.45em; padding-left: 0.5rem;
padding-right: 0.25em; padding-right: 0.3rem;
} }
} }

2
modules/ui/components/Stack.less
View file

@ -4,6 +4,6 @@
.root > * { .root > * {
border-bottom: 1px solid @border-color; border-bottom: 1px solid @border-color;
padding: 0.3em 0.5em; padding: 0.3rem 0.6rem;
} }

2
modules/ui/components/TabSwitcher.less
View file

@ -7,7 +7,7 @@
.tab { .tab {
@border: 1px solid @border-color; @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; cursor: pointer;
border-right: @border; border-right: @border;
display: inline-block; display: inline-block;

9
modules/ui/components/Toolbar.less
View file

@ -2,7 +2,7 @@
.root { .root {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
padding: 0.3em; padding: 0.3rem;
border-radius: 5px; border-radius: 5px;
} }
@ -10,8 +10,8 @@
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
font-size: 0.9em; font-size: 1rem;
padding: 0.3em 0.1em; padding: 0.3rem 0.1rem;
color: #555; color: #555;
&:hover { &:hover {
@ -31,7 +31,8 @@
} }
.small > * { .small > * {
font-size: 1.5em; font-size: 1.6rem;
padding: 0.5rem 0.2rem;
} }

4
modules/ui/components/Window.less
View file

@ -14,11 +14,11 @@
line-height: 1; line-height: 1;
cursor: default; cursor: default;
border-bottom: 1px solid @border-color; border-bottom: 1px solid @border-color;
padding-left: 0.5em; padding-left: 0.6rem;
} }
.button { .button {
display: inline-block; 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); .button-behavior(@color-danger);
} }

2
modules/ui/components/controls/ButtonGroup.less
View file

@ -2,7 +2,7 @@
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
& > * { & > * {
margin-left: 0.5em; margin-left: 0.5rem;
} }
} }

2
modules/ui/components/controls/InputControl.less
View file

@ -13,7 +13,7 @@
background: @bg; background: @bg;
outline: none; outline: none;
border: @bg 1px solid; border: @bg 1px solid;
padding: 0.2em; padding: 0.2rem;
&:focus { &:focus {
border: #444 1px solid; border: #444 1px solid;
} }

10
modules/ui/styles/init/main.less
View file

@ -1,14 +1,14 @@
@import "../theme"; @import "../theme";
@import "../mixins"; @import "../mixins";
html {
font: 10px 'Lucida Grande', sans-serif;
}
body { body {
background-color: @bg-color; background-color: @bg-color;
color: @font-color; color: @font-color;
font: 11px 'Lucida Grande', sans-serif; font-size: 1.1rem;
}
table {
font-size: 1em;
} }
iframe { iframe {

10
web/app/brep/debug/debugger/brepDebugger.less
View file

@ -1,6 +1,6 @@
:global :global
#brep-debugger { #brep-debugger {
font-size: 1.2em; font-size: 1.2rem;
position: absolute; position: absolute;
z-index: 998; z-index: 998;
left:10px; left:10px;
@ -12,7 +12,7 @@
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
color: #1a1a1a; color: #1a1a1a;
& .tool-caption { & .tool-caption {
padding: 0.3em; padding: 0.4rem;
background-color: rgb(238, 255, 246); background-color: rgb(238, 255, 246);
cursor: default; cursor: default;
user-select: none user-select: none
@ -34,11 +34,11 @@
visibility: hidden; visibility: hidden;
} }
padding: 0.3em; padding: 0.4rem;
line-height: 1.5; line-height: 1.5;
button { button {
font-size: inherit; font-size: inherit;
padding: 0 0.3em; padding: 0 0.4rem;
} }
& .operands-veiew { & .operands-veiew {
@ -90,7 +90,7 @@
} }
} }
.button { .button {
font-size: 1.3em; font-size: 1.7rem;
.clickable; .clickable;
} }
} }

2
web/app/cad/dom/actionInfo/ActionInfo.jsx
View file

@ -7,7 +7,7 @@ import {TOKENS as ACTION_TOKENS} from '../../actions/actionSystemPlugin';
import {TOKENS as KeyboardTokens} from '../../keyboard/keyboardPlugin'; import {TOKENS as KeyboardTokens} from '../../keyboard/keyboardPlugin';
function ActionInfo({actionId, x, y, info, hint, hotKey}) { function ActionInfo({actionId, x, y, info, hint, hotKey}) {
let visible = !!actionId; let visible = !!(actionId && (info || hint || hotKey));
return <AuxWidget visible={visible} return <AuxWidget visible={visible}
left={x} top={y} className={ls.root} zIndex={550}> left={x} top={y} className={ls.root} zIndex={550}>

2
web/app/cad/dom/components/ControlBar.less
View file

@ -15,7 +15,7 @@
.button { .button {
cursor: pointer; cursor: pointer;
padding: 0.5em 0.5em 0.35em 0.5em; padding: 0.5rem 0.5rem 0.4rem 0.5rem;
&:hover { &:hover {
background-color: @work-area-control-bar-bg-color-active; background-color: @work-area-control-bar-bg-color-active;

2
web/app/cad/dom/components/View3d.less
View file

@ -16,5 +16,5 @@
} }
.leftToolbarGroup > * { .leftToolbarGroup > * {
margin-bottom: 0.8em; margin-bottom: 0.9rem;
} }

1
web/app/cad/dom/components/WebApplication.jsx
View file

@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import 'ui/styles/init/minireset.css'; import 'ui/styles/init/minireset.css';
import 'ui/styles/init/main.less'; import 'ui/styles/init/main.less';
import '../../../../css/app3d-legacy.less';
import AppTabs from "./AppTabs"; import AppTabs from "./AppTabs";

2
web/css/app3d-legacy.less
View file

@ -132,7 +132,7 @@
.modification-button { .modification-button {
line-height: 27px; line-height: 27px;
font-size: 1.3em; font-size: 1.3rem;
padding: 0 3px 0 3px; padding: 0 3px 0 3px;
&:hover { &:hover {
color: yellowgreen; color: yellowgreen;