From 068518b535fac3456c8e44da1a2a831e44f1674e Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 25 Feb 2015 18:59:36 -0800 Subject: [PATCH] [Frontend] Minor sanding WTD-894 Fix to correct spacing problem in object-header --- .../browse/res/templates/browse/object-header.html | 2 +- platform/commonUI/general/res/css/theme-espresso.css | 10 +++++----- platform/commonUI/general/res/sass/_icons.scss | 1 + .../commonUI/general/res/sass/controls/_controls.scss | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 3b9b64e4ea..6d11c497da 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -1,6 +1,6 @@
{{type.getGlyph()}} - {{parameters.mode}} + {{parameters.mode}} {{type.getName()}} {{model.name}} v diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index c388f33600..f23542537d 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -629,9 +629,10 @@ span { /* line 57, ../sass/_icons.scss */ .object-header .type-icon { - color: #ffc700; } + color: #ffc700; + margin-right: 5px; } -/* line 64, ../sass/_icons.scss */ +/* line 65, ../sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .icon-btn .menu.dropdown .icon, @@ -1366,12 +1367,11 @@ label.checkbox.custom { /* line 366, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { - font-size: 1.2em; } + font-size: 1.1em; } /* line 368, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { - display: inline-block; - margin-right: 5px; } + display: inline-block; } /******************************************************** VIEW-CONTROLS */ /* line 377, ../sass/controls/_controls.scss */ diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 69560bb259..e5557785fe 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -56,6 +56,7 @@ .object-header .type-icon { color: $colorAlt1; + margin-right: $interiorMargin; } .menu .type-icon, diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index b21a726e14..0c68f6bc87 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -364,10 +364,10 @@ label.checkbox.custom { .top-bar, .object-browse-bar { .object-header { - font-size: 1.2em; + font-size: 1.1em; span { display: inline-block; - margin-right: $interiorMargin; +// margin-right: $interiorMargin; } } }