From 6dca3406756c919d5b9d8fb1e56cb38170e28f6b Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Mon, 3 Oct 2016 14:30:58 +0200 Subject: [PATCH] Update style of select options --- src/trait_manager/view/TraitView.js | 2 +- styles/css/main.css | 7 +++++-- styles/scss/main.scss | 12 ++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js index e4bed5058..0ddda7e62 100644 --- a/src/trait_manager/view/TraitView.js +++ b/src/trait_manager/view/TraitView.js @@ -16,7 +16,7 @@ define(['backbone'], function (Backbone) { * @param {Object} el Test * @private */ - onChange: function(elView) { + onChange: function(elView) { //<-- TraitRenderer var m = this.model; var attrs = elView.model.get('attributes'); attrs[m.get('name')] = m.get('value'); diff --git a/styles/css/main.css b/styles/css/main.css index 560e1733b..7012c5ef9 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2631,7 +2631,10 @@ $fontColorActive: #4f8ef7; .gjs-checker-bg, .checker-bg, .gjs-sm-sector .gjs-sm-property .gjs-sm-layer > #gjs-sm-preview-box, .gjs-clm-tags .gjs-sm-property .gjs-sm-layer > #gjs-sm-preview-box { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg=="); } -.gjs-bg-main, .gjs-off-prv, .gjs-pn-panel, .gjs-nv-item .gjs-nv-title-c, .gjs-sm-sector .gjs-sm-colorp-c, .gjs-clm-tags .gjs-sm-colorp-c, .gjs-mdl-dialog, #gjs-rte-toolbar, .sp-container { +.gjs-bg-main, .gjs-off-prv, .gjs-select option, +.gjs-clm-select option, +.gjs-sm-select option, +.gjs-sm-unit option, .gjs-pn-panel, .gjs-nv-item .gjs-nv-title-c, .gjs-sm-sector .gjs-sm-colorp-c, .gjs-clm-tags .gjs-sm-colorp-c, .gjs-mdl-dialog, #gjs-rte-toolbar, .sp-container { background-color: #444; } .gjs-color-main, .gjs-off-prv, .gjs-btn-prim, .gjs-pn-panel, .gjs-pn-btn, .gjs-btnt, .gjs-sm-sector .gjs-sm-field.gjs-sm-composite, .gjs-clm-tags .gjs-sm-field.gjs-sm-composite, .gjs-sm-sector .gjs-sm-composite.gjs-clm-field, .gjs-clm-tags .gjs-sm-composite.gjs-clm-field, .gjs-sm-sector .gjs-sm-stack #gjs-sm-add, .gjs-clm-tags .gjs-sm-stack #gjs-sm-add, .gjs-mdl-dialog, #gjs-rte-toolbar .gjs-rte-btn { @@ -3107,7 +3110,7 @@ ol.example li.placeholder:before { .gjs-field select { height: 20px; } .gjs-field option { - margin: 5px 0; } + padding: 5px 0; } .gjs-field .gjs-sel-arrow { height: 100%; width: 9px; diff --git a/styles/scss/main.scss b/styles/scss/main.scss index 86cdb4338..58c8e098e 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -210,6 +210,14 @@ div.#{$app-prefix}select{ .#{$app-prefix}select select:focus { outline: none; } + +.#{$app-prefix}select option, +.#{$clm-prefix}select option, +.#{$sm-prefix}select option, +.#{$sm-prefix}unit option{ + @extend .#{$app-prefix}bg-main; + //background-color: $mainDkColor; +} /************* CANVAS ****************/ .#{$cv-prefix}canvas { background-color: rgba(0, 0, 0, 0.15); @@ -638,7 +646,7 @@ $arrowColor: $mainLhlColor; /*b1b1b1*/ } option{ - margin: 5px 0; + padding: 5px 0; } .#{$app-prefix}sel-arrow { @@ -1494,4 +1502,4 @@ $uploadPadding: 150px 10px; border: 1px solid rgba(0, 0, 0, 0.8); } -.#{$app-prefix}hidden{ display: none; } \ No newline at end of file +.#{$app-prefix}hidden{ display: none; }