From f28d2f19d05c67f82c39e44cd2450836a449dd99 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 16 Sep 2015 15:52:56 -0700 Subject: [PATCH] [Frontend/PLATFORM] Cherry picking from platform changes in vista65 open #95 vista #65 scss and html mods for VISTA-related elements; (cherry picked from commit 6ef3987) --- platform/commonUI/general/res/sass/controls/_buttons.scss | 4 ++++ .../commonUI/general/res/sass/forms/_channel-selector.scss | 6 +++--- .../commonUI/general/res/templates/controls/selector.html | 4 ++-- platform/features/layout/bundle.json | 2 +- platform/features/layout/src/elements/ElementFactory.js | 3 +-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c81e24c4e4..abf191cece 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -41,6 +41,10 @@ $pad: $interiorMargin * $baseRatio; vertical-align: top; } + &.lg { + font-size: 1rem; + } + &.sm { padding: 0 $pad / $baseRatio; } diff --git a/platform/commonUI/general/res/sass/forms/_channel-selector.scss b/platform/commonUI/general/res/sass/forms/_channel-selector.scss index 02c28f3858..dad1a1930c 100644 --- a/platform/commonUI/general/res/sass/forms/_channel-selector.scss +++ b/platform/commonUI/general/res/sass/forms/_channel-selector.scss @@ -36,11 +36,11 @@ .btns-add-remove { // background: rgba(#ff0000, 0.3);; margin-top: 150px; - .btn { + .s-btn { display: block; - font-size: 1.5em; + //font-size: 1.5em; margin-bottom: $interiorMargin; - padding: 10px; + //padding: 10px; text-align: center; } } diff --git a/platform/commonUI/general/res/templates/controls/selector.html b/platform/commonUI/general/res/templates/controls/selector.html index d6f0f324a3..4c0de20bca 100644 --- a/platform/commonUI/general/res/templates/controls/selector.html +++ b/platform/commonUI/general/res/templates/controls/selector.html @@ -43,11 +43,11 @@
- > - < diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json index c53ade93f2..3503e3c88d 100644 --- a/platform/features/layout/bundle.json +++ b/platform/features/layout/bundle.json @@ -1,6 +1,6 @@ { "name": "Layout components.", - "description": "Plug in adding Layout capabiltiies.", + "description": "Plug in adding Layout capabilities.", "extensions": { "views": [ { diff --git a/platform/features/layout/src/elements/ElementFactory.js b/platform/features/layout/src/elements/ElementFactory.js index 63dbb82757..6dbef2f708 100644 --- a/platform/features/layout/src/elements/ElementFactory.js +++ b/platform/features/layout/src/elements/ElementFactory.js @@ -44,8 +44,7 @@ define( }, "fixed.text": { fill: "transparent", - stroke: "transparent", - color: "#cccccc" + stroke: "transparent" } }, DIALOGS = {