Issue: #23853: Fixed order relation widget

diff --git a/enyo-client/application/source/widgets/combobox.js b/enyo-client/application/source/widgets/combobox.js
index 35c5b75..58b2c66 100644 (file)
--- a/enyo-client/application/source/widgets/combobox.js
+++ b/enyo-client/application/source/widgets/combobox.js
@@ -70,12 +70,9 @@ regexp:true, undef:true, trailing:true, white:true */
       this.inherited(arguments);
       this.createComponent({
         name: "comboboxNote",
-        container: this.$.fittableColumns,
+        container: this.$.container,
         classes: "xv-combobox-note"
       });
-      // TODO: git rid of this
-      this.$.input.applyStyle("padding-top", "8px");
-      this.$.input.applyStyle("padding-left", "8px");
     },
     /**
       Populate the note field

diff --git a/lib/enyo-x/source/less/grid.less b/lib/enyo-x/source/less/grid.less
index cbde2ff..7b5cccc 100644 (file)
--- a/lib/enyo-x/source/less/grid.less
+++ b/lib/enyo-x/source/less/grid.less
@@ -41,11 +41,7 @@
   }
 
   .xv-grid-attr {
-    // This limits the text to four lines
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-line-clamp: 4;
-    -webkit-box-orient: vertical;
+    .xv-limit-description
 
     &.bold {
     font-weight: bold;

diff --git a/lib/enyo-x/source/less/screen.less b/lib/enyo-x/source/less/screen.less
index 9c32866..4d0d13a 100644 (file)
--- a/lib/enyo-x/source/less/screen.less
+++ b/lib/enyo-x/source/less/screen.less
@@ -85,6 +85,14 @@ a, .hyperlink {
   border: none;
 }
 
+  // This gives them 4 lines of description
+.xv-limit-description {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 4;
+  -webkit-box-orient: vertical;
+}
+
 .xv-app-panel {
   /* Setting this as min-width overrides enyo-narrow 100% */
   width: @defaultPanelWidth;

diff --git a/lib/enyo-x/source/less/workspace.less b/lib/enyo-x/source/less/workspace.less
index bea1cee..c00b2ff 100644 (file)
--- a/lib/enyo-x/source/less/workspace.less
+++ b/lib/enyo-x/source/less/workspace.less
@@ -152,12 +152,7 @@
       */
       .xv-relationwidget {
         .xv-description {
-          overflow: hidden;
-
-          // This gives them 4 lines of description
-          display: -webkit-box;
-          -webkit-line-clamp: 4;
-          -webkit-box-orient: vertical;
+          .xv-limit-description;
 
           max-width: 250px;
           margin: 5px 5px 5px 80px;

diff --git a/lib/enyo-x/source/stylesheets/screen.css b/lib/enyo-x/source/stylesheets/screen.css
index cecbb23..bc18759 100755 (executable)
--- a/lib/enyo-x/source/stylesheets/screen.css
+++ b/lib/enyo-x/source/stylesheets/screen.css
@@ -1532,6 +1532,12 @@ a,
   padding: 0;
   border: none;
 }
+.xv-limit-description {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 4;
+  -webkit-box-orient: vertical;
+}
 .xv-app-panel {
   /* Setting this as min-width overrides enyo-narrow 100% */
   width: 320px;
@@ -2317,13 +2323,7 @@ a,
 .xv-grid-box .xv-scroller {
   background: #f8f8f8;
 }
-.xv-grid-box .xv-grid-attr {
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 4;
-  -webkit-box-orient: vertical;
-}
-.xv-grid-box .xv-grid-attr.bold {
+.xv-limit-description .xv-grid-box .xv-grid-attr.bold {
   font-weight: bold;
 }
 .xv-grid-box .xv-grid-attr.error {

diff --git a/lib/enyo-x/source/widgets/combobox.js b/lib/enyo-x/source/widgets/combobox.js
index 0c84c4d..a20fd81 100644 (file)
--- a/lib/enyo-x/source/widgets/combobox.js
+++ b/lib/enyo-x/source/widgets/combobox.js
@@ -28,7 +28,7 @@ regexp:true, undef:true, trailing:true, white:true, browser:true */
       onValueChange: "controlValueChanged"
     },
     components: [
-      {controlClasses: 'enyo-inline', components: [
+      {controlClasses: 'enyo-inline', name: "container", components: [
         {name: "label", classes: "xv-label"},
         {kind: "onyx.InputDecorator", tag: "div", classes: "xv-icon-decorator", components: [
           {name: "input", kind: "onyx.Input", onkeyup: "keyUp", onkeydown: "keyDown",

diff --git a/lib/enyo-x/source/widgets/date.js b/lib/enyo-x/source/widgets/date.js
index 46ae0a3..74ec7c6 100644 (file)
--- a/lib/enyo-x/source/widgets/date.js
+++ b/lib/enyo-x/source/widgets/date.js
@@ -23,11 +23,8 @@ regexp:true, undef:true, trailing:true, white:true */
       nullText: ""
     },
     components: [
-      {kind: "FittableColumns", components: [
-        {name: "label", content: "", fit: true, classes: "xv-flexible-label"},
-        // setting the tag to "div" on the decorator
-        // so that clicks of button don't get redirected back
-        // to the input field (default behavior)
+      {controlClasses: 'enyo-inline', components: [
+        {name: "label", classes: "xv-label"},
         {kind: "onyx.InputDecorator", name: "decorator", tag: "div",
           classes: "xv-icon-decorator", components: [
           {name: "input", kind: "onyx.Input", onchange: "inputChanged",
@@ -37,7 +34,6 @@ regexp:true, undef:true, trailing:true, white:true */
         ]},
         {name: "datePickPopup", kind: "onyx.Popup", maxHeight: 400, floating: true,
             centered: true, modal: true, components: [
-          // TODO: get rid of this inline style
           {kind: "GTS.DatePicker", name: "datePick", style: "min-width:400px;",
             onChange: "datePicked"}
         ]}

diff --git a/lib/enyo-x/source/widgets/text_area.js b/lib/enyo-x/source/widgets/text_area.js
index 567a93d..6b664c7 100644 (file)
--- a/lib/enyo-x/source/widgets/text_area.js
+++ b/lib/enyo-x/source/widgets/text_area.js
@@ -22,7 +22,7 @@ regexp:true, undef:true, trailing:true, white:true */
       showLabel: false
     },
     components: [
-      {name: "label", content: "", fit: true, classes: "xv-flexible-label"},
+      {name: "label", classes: "xv-label"},
       {name: "input", kind: "onyx.TextArea", classes: "xv-textarea-input",
         onchange: "inputChanged", onkeydown: "keyDown"}
     ]