diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index d5e363bcd9..335ceafac1 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -200,8 +200,8 @@ .form .form-row.first { border-top: none; } /* line 52, ../sass/forms/_elems.scss */ - .form .form-row .label, - .form .form-row .controls { + .form .form-row > .label, + .form .form-row > .controls { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index b34ca46897..b9be506ef9 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -3545,8 +3545,8 @@ label.checkbox.custom { .form .form-row.first { border-top: none; } /* line 52, ../sass/forms/_elems.scss */ - .form .form-row .label, - .form .form-row .controls { + .form .form-row > .label, + .form .form-row > .controls { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 770338d9f8..73d260de38 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -180,7 +180,7 @@ ul.tree { -webkit-transition: background-color 0.25s; transition: background-color 0.25s; display: block; - font-size: 0.8em; + font-size: 0.8rem; height: 1.5rem; line-height: 1.5rem; margin-bottom: 3px; diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index 61825dfd2f..0f430c2391 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -49,8 +49,8 @@ border-top: none; } - .label, - .controls { + >.label, + >.controls { @include box-sizing(border-box); @include clearfix; font-size: 0.8rem; diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 330bdeb5d5..8a0c4c1e2a 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -38,7 +38,7 @@ ul.tree { @include border-radius($basicCr); @include single-transition(background-color, 0.25s); display: block; - font-size: 0.8em; + font-size: 0.8rem; height: $menuLineH; line-height: $menuLineH; margin-bottom: $interiorMarginSm;