Merge pull request #1609 from xtuple/4_5_x

Merge 4_5_x into 4_6_x

diff --git a/lib/enyo-x/source/less/screen.less b/lib/enyo-x/source/less/screen.less
index d169970..40f1005 100644 (file)
--- a/lib/enyo-x/source/less/screen.less
+++ b/lib/enyo-x/source/less/screen.less
@@ -337,11 +337,13 @@ body {
   }
 
   .xv-toolbar-label, .xv-search {
-    color: @white;
     width: @searchLength;
     margin: 0;
     margin-left: 6px;
   }
+  .xv-search {
+    color: @med-gray;
+  }
 }
 
 // local imports

diff --git a/lib/enyo-x/source/stylesheets/screen.css b/lib/enyo-x/source/stylesheets/screen.css
index 5be7fe3..7836159 100755 (executable)
--- a/lib/enyo-x/source/stylesheets/screen.css
+++ b/lib/enyo-x/source/stylesheets/screen.css
@@ -1795,11 +1795,13 @@ body {
 }
 .onyx-toolbar .xv-toolbar-label,
 .onyx-toolbar .xv-search {
-  color: #fdfdfd;
   width: 185px;
   margin: 0;
   margin-left: 6px;
 }
+.onyx-toolbar .xv-search {
+  color: #939393;
+}
 .xv-navigator .xv-header {
   background-color: #fdfdfd;
   padding: 6px 12px;

diff --git a/lib/enyo-x/source/views/navigator.js b/lib/enyo-x/source/views/navigator.js
index 5b93c94..52eaa55 100644 (file)
--- a/lib/enyo-x/source/views/navigator.js
+++ b/lib/enyo-x/source/views/navigator.js
@@ -78,8 +78,8 @@ trailing:true*/
                icon: "time",
                ontap: "showHistory", content: "_history".loc()},
             {kind: "font.TextIcon", name: "searchIconButton",
-               icon: "search",
-               ontap: "showParameters", content: "_search".loc(), showing: false},
+               icon: "search", ontap: "showParameters",
+               content: "_search".loc(), showing: false},
             {kind: "font.TextIcon", name: "helpIconButton",
                icon: "question",
                ontap: "showHelp", content: "_help".loc()}
@@ -137,13 +137,12 @@ trailing:true*/
             {kind: "font.TextIcon", icon: "share", content: "_export".loc()},
             {kind: "onyx.Menu", name: "exportMenu", floating: true}
           ]},
+          {kind: "XV.SortPopup", name: "sortPopup", showing: false},
           {name: "search", kind: "onyx.InputDecorator",
-            showing: false, components: [
-            {name: 'searchInput', kind: "onyx.Input", classes: "xv-search",
+            showing: false, classes: "xv-search", components: [
+            {name: 'searchInput', kind: "onyx.Input",
               placeholder: "_search".loc(), onchange: "inputChanged"},
-            {kind: "Image", src: "/assets/search-input-search.png",
-              name: "searchJump", ontap: "jump"},
-            {kind: "XV.SortPopup", name: "sortPopup", showing: false}
+            {tag: "i", classes: "icon-search", name: "searchJump", ontap: "jump"}
           ]}
         ]},
         {name: "messageHeader"},

diff --git a/lib/enyo-x/source/views/search.js b/lib/enyo-x/source/views/search.js
index c132e21..fbd7e88 100644 (file)
--- a/lib/enyo-x/source/views/search.js
+++ b/lib/enyo-x/source/views/search.js
@@ -60,11 +60,11 @@ trailing:true, white:true*/
           {name: "spacer", classes: "spacer", fit: true},
           {kind: "font.TextIcon", name: "refreshButton",
               icon: "rotate-right", content: "_refresh".loc(), ontap: "requery"},
-          {name: "search", kind: "onyx.InputDecorator", components: [
-            {name: 'searchInput', kind: "onyx.Input", classes: "xv-search",
+          {name: "search", kind: "onyx.InputDecorator",
+            classes: "xv-search", components: [
+            {name: 'searchInput', kind: "onyx.Input",
               placeholder: "_search".loc(), onchange: "requery"},
-            {kind: "Image", src: "/assets/search-input-search.png",
-              name: "searchJump", ontap: "jump"}
+            {tag: "i", classes: "icon-search", name: "searchJump", ontap: "jump"}
           ]}
         ]},
         {name: "messageHeader", content: "", classes: ""},

diff --git a/node-datasource/views/login/assets/grabbutton.png b/node-datasource/views/login/assets/grabbutton.png
deleted file mode 100644 (file)
index 1dc205a..0000000
Binary files a/node-datasource/views/login/assets/grabbutton.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/item-hilite.png b/node-datasource/views/login/assets/item-hilite.png
deleted file mode 100644 (file)
index 7e9c07d..0000000
Binary files a/node-datasource/views/login/assets/item-hilite.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/login-blue-scr.png b/node-datasource/views/login/assets/login-blue-scr.png
deleted file mode 100644 (file)
index 33ff19c..0000000
Binary files a/node-datasource/views/login/assets/login-blue-scr.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/login-logo.png b/node-datasource/views/login/assets/login-logo.png
deleted file mode 100644 (file)
index 02e187b..0000000
Binary files a/node-datasource/views/login/assets/login-logo.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-bookmark.png b/node-datasource/views/login/assets/menu-icon-bookmark.png
deleted file mode 100644 (file)
index 4c26d8f..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-bookmark.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-export.png b/node-datasource/views/login/assets/menu-icon-export.png
deleted file mode 100644 (file)
index d309e06..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-export.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-gear.png b/node-datasource/views/login/assets/menu-icon-gear.png
deleted file mode 100644 (file)
index b4027b2..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-gear.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-help.png b/node-datasource/views/login/assets/menu-icon-help.png
deleted file mode 100644 (file)
index e8c0fbe..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-help.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-lock.png b/node-datasource/views/login/assets/menu-icon-lock.png
deleted file mode 100644 (file)
index 5f7b79e..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-lock.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-new.png b/node-datasource/views/login/assets/menu-icon-new.png
deleted file mode 100644 (file)
index 8725795..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-new.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-refresh.png b/node-datasource/views/login/assets/menu-icon-refresh.png
deleted file mode 100644 (file)
index 2575608..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-refresh.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-relation.png b/node-datasource/views/login/assets/menu-icon-relation.png
deleted file mode 100644 (file)
index 4823db2..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-relation.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/menu-icon-search.png b/node-datasource/views/login/assets/menu-icon-search.png
deleted file mode 100644 (file)
index 4823db2..0000000
Binary files a/node-datasource/views/login/assets/menu-icon-search.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/relation-icon-search.png b/node-datasource/views/login/assets/relation-icon-search.png
deleted file mode 100644 (file)
index d409fd9..0000000
Binary files a/node-datasource/views/login/assets/relation-icon-search.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/search-input-search.png b/node-datasource/views/login/assets/search-input-search.png
deleted file mode 100644 (file)
index 36bf1b5..0000000
Binary files a/node-datasource/views/login/assets/search-input-search.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/setup-icon.png b/node-datasource/views/login/assets/setup-icon.png
deleted file mode 100644 (file)
index 721ad6e..0000000
Binary files a/node-datasource/views/login/assets/setup-icon.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/sliding-shadow.png b/node-datasource/views/login/assets/sliding-shadow.png
deleted file mode 100644 (file)
index 7b23803..0000000
Binary files a/node-datasource/views/login/assets/sliding-shadow.png and /dev/null differ

diff --git a/node-datasource/views/login/assets/sort-icon.png b/node-datasource/views/login/assets/sort-icon.png
deleted file mode 100644 (file)
index f45e253..0000000
Binary files a/node-datasource/views/login/assets/sort-icon.png and /dev/null differ