Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/Application.scss

@@ -108,6 +108,21 @@ body.launching {
   }
 }
 
+.x-form-item-default.x-item-disabled {
+  opacity: 1;
+
+  .x-form-item-label-default {
+    color: #8C97B2;
+  }
+
+  .x-form-text-default {
+    background: #EEF1F7;
+  }
+  .x-form-trigger {
+    background: #EEF1F7;
+  }
+}
+
 .x-btn.x-btn-menu-active.x-btn-default-toolbar-small,
 .x-btn.x-btn-pressed.x-btn-default-toolbar-small,
 .x-btn-over.x-btn-default-toolbar-small {

frontend/saas-web/app/view/core/form/ConDateField.js

@@ -21,7 +21,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             width: 100,
             editable: false,
             hidden: !me.showscope,
-            fieldStyle: 'background:#C1CDC1',
+            fieldStyle: 'background:#eef1f7',
             store: Ext.create('Ext.data.Store', {
                 fields: ['display', 'value'],
                 data : [

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -50,7 +50,7 @@
         }
     }
     .x-audited {
-        border: 1px solid #FF0000;
-        color: #FF0000;
+        border: 1px solid #FF002B;
+        color: #FF002B;
     }
 }

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -18,7 +18,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
         width: '100%',
     }, {
         margin: '32 0 0 0',
-        padding: '16 16 16 16',
+        padding: '24',
         reference: 'querygrid',
         xtype: 'core-query-querygridpanel',
         width: '100%',