From 2fcaabc0819daad4d2f79573533d48477f2a5b36 Mon Sep 17 00:00:00 2001 From: Linda Nichols Date: Mon, 16 Jun 2014 17:00:02 +0000 Subject: [PATCH] fixed most widgets, grid still broken --- lib/enyo-x/source/less/grid.less | 1 - lib/enyo-x/source/less/screen.less | 2 - lib/enyo-x/source/less/workspace.less | 39 ++++++ lib/enyo-x/source/stylesheets/screen.css | 123 ++++++++++++------- lib/enyo-x/source/widgets/characteristics.js | 26 ++-- 5 files changed, 128 insertions(+), 63 deletions(-) diff --git a/lib/enyo-x/source/less/grid.less b/lib/enyo-x/source/less/grid.less index 9ad3e6a4d..8dd651f9e 100644 --- a/lib/enyo-x/source/less/grid.less +++ b/lib/enyo-x/source/less/grid.less @@ -2,7 +2,6 @@ Styles relating to the grid box */ - /* Entire box including the grid and the summary panel */ .xv-grid-box { diff --git a/lib/enyo-x/source/less/screen.less b/lib/enyo-x/source/less/screen.less index 077db0440..036452c8c 100644 --- a/lib/enyo-x/source/less/screen.less +++ b/lib/enyo-x/source/less/screen.less @@ -363,8 +363,6 @@ a, .hyperlink { @import "dashboard.less"; @import "list.less"; @import "pullout.less"; -@import "widgets.less"; -@import "characteristics.less"; @import "relations.less"; @import "address.less"; @import "search.less"; diff --git a/lib/enyo-x/source/less/workspace.less b/lib/enyo-x/source/less/workspace.less index ecc545838..297af0308 100644 --- a/lib/enyo-x/source/less/workspace.less +++ b/lib/enyo-x/source/less/workspace.less @@ -147,6 +147,9 @@ } } + /** + Styles relating to workspace widgets + */ .xv-relationwidget { .xv-description { overflow: hidden; @@ -225,17 +228,53 @@ } } + .xv-characteristics-widget { + .xv-characteristic-item { + border-bottom: 1px solid @smoke; + .xv-input { + border: none; + input { + width: 135px; + } + } + } + .xv-characteristic-button { + text-align: center; + } + } + .enyo-fittable-columns-layout > * { vertical-align: middle; } } .onyx-input-decorator { + border: 0; + input { + width: 150px; + } &.onyx-disabled { .disabled; } } + // Dependency picker in workflow + .xv-dependency-picker { + .onyx-picker-decorator { + .onyx-button { + width: 280px; + margin-left: 6px; + } + } + } + + .xv-dependency-button { + color: @slate-blue; + font-size: 24px; + border: none; + background: transparent; + } + .xv-totals-panel { .onyx-input-decorator > input, * { font-size: @totalsFontSize; diff --git a/lib/enyo-x/source/stylesheets/screen.css b/lib/enyo-x/source/stylesheets/screen.css index dde16a2bf..f73f1d2c5 100755 --- a/lib/enyo-x/source/stylesheets/screen.css +++ b/lib/enyo-x/source/stylesheets/screen.css @@ -1627,6 +1627,9 @@ a, background: #f8f8f8; text-overflow: ellipsis; border: 1px solid #d7d7d7; + /** + Styles relating to workspace widgets + */ color: #070707; padding: 7px; } @@ -1752,6 +1755,18 @@ a, .xv-popup.xv-groupbox-popup .xv-currency-picker .enyo-tool-decorator .xv-button-text { width: 45px; } +.xv-popup.xv-groupbox-popup .xv-characteristics-widget .xv-characteristic-item { + border-bottom: 1px solid #d7d7d7; +} +.xv-popup.xv-groupbox-popup .xv-characteristics-widget .xv-characteristic-item .xv-input { + border: none; +} +.xv-popup.xv-groupbox-popup .xv-characteristics-widget .xv-characteristic-item .xv-input input { + width: 135px; +} +.xv-popup.xv-groupbox-popup .xv-characteristics-widget .xv-characteristic-button { + text-align: center; +} .xv-popup.xv-groupbox-popup .enyo-fittable-columns-layout > * { vertical-align: middle; } @@ -2036,6 +2051,9 @@ a, background: #f8f8f8; text-overflow: ellipsis; border: 1px solid #d7d7d7; + /** + Styles relating to workspace widgets + */ } .xv-workspace-container .xv-workspace .xv-workspace-panel .onyx-groupbox-header { padding: 6px 10px; @@ -2159,13 +2177,41 @@ a, .xv-workspace-container .xv-workspace .xv-workspace-panel .xv-currency-picker .enyo-tool-decorator .xv-button-text { width: 45px; } +.xv-workspace-container .xv-workspace .xv-workspace-panel .xv-characteristics-widget .xv-characteristic-item { + border-bottom: 1px solid #d7d7d7; +} +.xv-workspace-container .xv-workspace .xv-workspace-panel .xv-characteristics-widget .xv-characteristic-item .xv-input { + border: none; +} +.xv-workspace-container .xv-workspace .xv-workspace-panel .xv-characteristics-widget .xv-characteristic-item .xv-input input { + width: 135px; +} +.xv-workspace-container .xv-workspace .xv-workspace-panel .xv-characteristics-widget .xv-characteristic-button { + text-align: center; +} .xv-workspace-container .xv-workspace .xv-workspace-panel .enyo-fittable-columns-layout > * { vertical-align: middle; } +.xv-workspace-container .xv-workspace .onyx-input-decorator { + border: 0; +} +.xv-workspace-container .xv-workspace .onyx-input-decorator input { + width: 150px; +} .xv-workspace-container .xv-workspace .onyx-input-decorator.onyx-disabled { opacity: 0.8; cursor: default; } +.xv-workspace-container .xv-workspace .xv-dependency-picker .onyx-picker-decorator .onyx-button { + width: 280px; + margin-left: 6px; +} +.xv-workspace-container .xv-workspace .xv-dependency-button { + color: #357ec7; + font-size: 24px; + border: none; + background: transparent; +} .xv-workspace-container .xv-workspace .xv-totals-panel .onyx-input-decorator > input, .xv-workspace-container .xv-workspace .xv-totals-panel * { font-size: 14px; @@ -2999,6 +3045,9 @@ a, background: #f8f8f8; text-overflow: ellipsis; border: 1px solid #d7d7d7; + /** + Styles relating to workspace widgets + */ width: 100%; margin: 0 4px 6px 0; } @@ -3124,6 +3173,18 @@ a, .xv-pullout .xv-parameter-panel .xv-currency-picker .enyo-tool-decorator .xv-button-text { width: 45px; } +.xv-pullout .xv-parameter-panel .xv-characteristics-widget .xv-characteristic-item { + border-bottom: 1px solid #d7d7d7; +} +.xv-pullout .xv-parameter-panel .xv-characteristics-widget .xv-characteristic-item .xv-input { + border: none; +} +.xv-pullout .xv-parameter-panel .xv-characteristics-widget .xv-characteristic-item .xv-input input { + width: 135px; +} +.xv-pullout .xv-parameter-panel .xv-characteristics-widget .xv-characteristic-button { + text-align: center; +} .xv-pullout .xv-parameter-panel .enyo-fittable-columns-layout > * { vertical-align: middle; } @@ -3149,53 +3210,6 @@ a, color: #fdfdfd; border-bottom: 2px solid #d8d8d8; } -/** - Styles relating to misc widgets -*/ -.onyx-input-decorator { - border: 0; -} -.onyx-input-decorator input { - width: 150px; -} -.xv-dependency-picker .onyx-picker-decorator .onyx-button { - width: 280px; - margin-left: 6px; -} -.xv-dependency-button { - color: #357ec7; - font-size: 24px; - border: none; - background: transparent; -} -/** - Characteristics -*/ -.xv-characteristic-picker { - border: none; -} -.xv-characteristic-picker .onyx-picker-decorator .onyx-button { - width: 130px; -} -.xv-characteristic-item { - border-bottom: 1px solid #d7d7d7; -} -.xv-characteristic-item .onyx-input-decorator > input { - width: 115px; - margin-top: 10px; - margin-bottom: 10px; -} -.xv-characteristic-item > .xv-input { - border: none; -} -.xv-characteristic-buttons { - margin: 8px; -} -.xv-characteristic-button { - margin-left: 4px; - color: #357ec7; - font-size: 24px; -} /** Styles relating to RelationWidgets */ @@ -3317,6 +3331,9 @@ a, background: #f8f8f8; text-overflow: ellipsis; border: 1px solid #d7d7d7; + /** + Styles relating to workspace widgets + */ width: 100%; margin: 0 4px 6px 0; } @@ -3442,6 +3459,18 @@ a, .xv-search .xv-search-container .xv-currency-picker .enyo-tool-decorator .xv-button-text { width: 45px; } +.xv-search .xv-search-container .xv-characteristics-widget .xv-characteristic-item { + border-bottom: 1px solid #d7d7d7; +} +.xv-search .xv-search-container .xv-characteristics-widget .xv-characteristic-item .xv-input { + border: none; +} +.xv-search .xv-search-container .xv-characteristics-widget .xv-characteristic-item .xv-input input { + width: 135px; +} +.xv-search .xv-search-container .xv-characteristics-widget .xv-characteristic-button { + text-align: center; +} .xv-search .xv-search-container .enyo-fittable-columns-layout > * { vertical-align: middle; } diff --git a/lib/enyo-x/source/widgets/characteristics.js b/lib/enyo-x/source/widgets/characteristics.js index ae8971cb3..94ed8ffdc 100644 --- a/lib/enyo-x/source/widgets/characteristics.js +++ b/lib/enyo-x/source/widgets/characteristics.js @@ -19,7 +19,6 @@ white:true*/ /** @lends XV.CharacteristicPicker# */{ name: "XV.CharacteristicPicker", kind: "XV.PickerWidget", - classes: "xv-characteristic-picker", collection: "XM.characteristics", noneText: "_delete".loc(), noneClasses: "xv-negative", @@ -147,7 +146,7 @@ white:true*/ */ enyo.kind(/** @lends XV.CharacteristicItem# */{ name: "XV.CharacteristicItem", - kind: "FittableColumns", + kind: "enyo.Control", classes: "xv-characteristic-item", published: { value: null, @@ -157,13 +156,15 @@ white:true*/ onValueChange: "controlValueChanged" }, components: [ - {kind: "XV.CharacteristicPicker", attr: "characteristic", - showLabel: false}, - {kind: "XV.InputWidget", attr: "value", showLabel: false}, - {kind: "XV.DateWidget", attr: "value", showLabel: false, - showing: false}, - {kind: "XV.OptionsPicker", attr: "value", showLabel: false, - showing: false} + {controlClasses: 'enyo-inline', components: [ + {kind: "XV.CharacteristicPicker", attr: "characteristic", + showLabel: false}, + {kind: "XV.InputWidget", attr: "value", showLabel: false}, + {kind: "XV.DateWidget", attr: "value", showLabel: false, + showing: false}, + {kind: "XV.OptionsPicker", attr: "value", showLabel: false, + showing: false} + ]} ], disabledChanged: function (oldValue) { this.$.characteristicPicker.setDisabled(this.disabled); @@ -258,7 +259,7 @@ white:true*/ */ enyo.kind(/** @lends XV.CharacteristicsWidget# */{ name: "XV.CharacteristicsWidget", - classes: "xv-characteristics-widget", + classes: "xv-characteristics-widget xv-input", published: { attr: null, model: null, @@ -274,11 +275,10 @@ white:true*/ {kind: "Repeater", count: 0, onSetupItem: "setupItem", components: [ {kind: "XV.CharacteristicItem"} ]}, - {controlClasses: 'enyo-inline', classes: "xv-characteristic-buttons", components: [ + {controlClasses: 'enyo-inline', classes: "xv-buttons", components: [ {name: "label", classes: "xv-label"}, {kind: "onyx.Button", name: "newButton", - classes: "icon-plus xv-characteristic-button", - onclick: "newItem"} + classes: "icon-plus xv-characteristic-button", onclick: "newItem"} ]} ], create: function () { -- 2.39.2