Merge branch 'release/v2.0.0'

ArasLabs · Aug 13, 2018 · b6675ab · b6675ab
2 parents c2e6cf2 + 8969a29
commit b6675ab
Show file tree

Hide file tree

Showing 9 changed files with 331 additions and 242 deletions.
diff --git a/CodeTree/Innovator/Client/customer/myStyles.css b/CodeTree/Innovator/Client/customer/myStyles.css
@@ -1,6 +1,7 @@
 /*
   Aras Labs
   Eli Donahue - 10/27/16
+  Updated for Aras 11 SP12 - 8/13/18
 
   Custom CSS to override the default Aras form CSS
   All sys_f_* classes can be found in Innovator\Client\styles\default.css
@@ -94,11 +95,35 @@ input[type="image"] {
 /* Custom class CSS */
 
 .my_label {
-    margin-bottom: 8px;
     font-weight: bold;
+    font-size: 8pt;
 }
 
 .my_select {
+    background: rgba(255, 255, 255, .1);
+    border: none;
+    border-radius: 4px 0px 0px 4px;
+    margin: 0;
+    outline: 0;
+    padding: 7px;
+    box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    background-color: #e8eeef;
+    color: #8a97a0;
+    -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.03) inset;
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.03) inset;
+    border: 1px solid #D9DEDF;
+    color: #000;
+
+    -webkit-appearance: menulist-button;
+    height: 30px;
+
+    /* subtract width of button from item and dropdown fields */
+    width: calc(100% - 30px) !important;
+}
+
+.my_custom_span {
     background: rgba(255, 255, 255, .1);
     border: none;
     border-radius: 4px;
@@ -126,6 +151,13 @@ input[type="image"] {
     border-radius: 4px 0px 0px 4px;
 }
 
+.my_button {
+    border-radius: 0px 4px 4px 0px;
+    height: 30px !important;
+    background-color: #3668b1 !important;
+    width: 30px !important;
+}
+
 .info_group {
     background: #E8EEEF;
     color: #000;

diff --git a/Import/CustomFormCss/Import/Method/labs_StyleForm.xml b/Import/CustomFormCss/Import/Method/labs_StyleForm.xml
@@ -46,7 +46,8 @@
     // get element associated with an item property's "button"
     getItemFieldButton = function (field) {
         var itms = document.getElementsByClassName(field);
-        return itms[0].getElementsByClassName("sys_f_input_image");
+        var parentEl = itms[0].parentElement;
+        return parentEl.getElementsByTagName("button");
     };
 
     // replace icon on an item property's "button"
@@ -62,13 +63,25 @@
     var labels = document.getElementsByClassName("sys_f_label");
     setAttributeOnAll(labels, 'style', '');
     appendAttributeOnAll(labels, 'class', 'my_label');
+    
+    // required in 11 SP12+ to style dropdown fields & item fields
+    labels = document.getElementsByClassName("aras-field__label");
+    setAttributeOnAll(labels, 'style', '');
+    appendAttributeOnAll(labels, 'class', 'my_label');
 
     // default select style 
-    var selects = document.getElementsByClassName('sys_f_select');
-    replaceClass(selects, 'sys_f_select', 'my_select');
-
-    selects = document.getElementsByClassName('sys_f_div_select');
-    replaceClass(selects, 'sys_f_div_select', 'my_select_div');
+    var selects = document.getElementsByClassName('aras-filter-list__input');
+    replaceClass(selects, 'aras-filter-list__input', 'my_select ');
+
+    selects = document.getElementsByClassName('aras-dropdown-container');
+    replaceClass(selects, 'aras-dropdown-container', ' my_select_div');
+    
+    // style dropdown and item field buttons
+    var buttons = document.getElementsByClassName('aras-filter-list__button');
+    appendAttributeOnAll(buttons, 'class', 'my_button');
+    
+    buttons = document.getElementsByClassName('aras-filter-list__button_ellipsis');
+    appendAttributeOnAll(buttons, 'class', 'my_button');
 
     // default date select style with custom button icon and class
     var cals = document.getElementsByClassName("sys_f_input_image_calendar_ff");