Release 18.1.5

DevExpress · Aug 1, 2018 · caa7443 · caa7443
1 parent 17500ea
commit caa7443
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/styles/widgets/material/lookup.material.less b/styles/widgets/material/lookup.material.less
@@ -1,7 +1,7 @@
 .dx-size-default() {
-    @MATERIAL_LOOKUP_HEIGHT: 56px;
+    @MATERIAL_FILLED_LOOKUP_HEIGHT: 56px;
+    @MATERIAL_STANDARD_LOOKUP_HEIGHT: 32px;
     @MATERIAL_LOOKUP_FONT_SIZE: 16px;
-    @MATERIAL_LOOKUP_FIELD_HORIZONTAL_PADDING: 12px;
     @MATERIAL_LOOKUP_POPUP_CONTENT_TOP: 49px;
     @MATERIAL_LOOKUP_POPUP_CONTENT_PADDING: 20px;
     @MATERIAL_LOOKUP_LIST_TOP: 70px;
@@ -17,8 +17,8 @@
     @MATERIAL_LOOKUP_INVALID_MESSAGE_MARGIN_BOTTOM: 20px;
 }
 .dx-size-compact() {
-    @MATERIAL_LOOKUP_HEIGHT: 26px;
-    @MATERIAL_LOOKUP_POPUP_CONTENT_TOP: 36px;
+    @MATERIAL_FILLED_LOOKUP_HEIGHT: 56px;
+    @MATERIAL_STANDARD_LOOKUP_HEIGHT: 32px;
     @MATERIAL_LOOKUP_POPUP_CONTENT_PADDING: 10px;
     @MATERIAL_LOOKUP_LIST_TOP: 45px;
 
@@ -32,18 +32,20 @@
     @MATERIAL_LOOKUP_INVALID_MESSAGE_PADDING_BOTTOM: 10px;
     @MATERIAL_LOOKUP_INVALID_MESSAGE_MARGIN_BOTTOM: 10px;
 }
-@MATERIAL_LOOKUP_FIELD_PADDING:
-    @MATERIAL_BASE_INLINE_BORDEREDWIDGET_TOP_PADDING
-    @MATERIAL_LOOKUP_FIELD_HORIZONTAL_PADDING
-    @MATERIAL_BASE_INLINE_BORDEREDWIDGET_BOTTOM_PADDING;
-@MATERIAL_LOOKUP_FIELD_PADDING_RTL:
-    @MATERIAL_BASE_INLINE_BORDEREDWIDGET_TOP_PADDING
-    @MATERIAL_LOOKUP_FIELD_HORIZONTAL_PADDING
-    @MATERIAL_BASE_INLINE_BORDEREDWIDGET_BOTTOM_PADDING;
-
 
 .dx-lookup {
-    height: @MATERIAL_LOOKUP_HEIGHT;
+    &.dx-editor-filled {
+        height: @MATERIAL_FILLED_LOOKUP_HEIGHT;
+        .dx-lookup-field {
+            padding: @MATERIAL_FILLED_TEXTEDITOR_INPUT_PADDING;
+        }
+    }
+    &.dx-editor-standard {
+        height: @MATERIAL_STANDARD_LOOKUP_HEIGHT;
+        .dx-lookup-field {
+            padding: @MATERIAL_STANDARD_TEXTEDITOR_INPUT_PADDING;
+        }
+    }
 
     &.dx-state-focused {
         &:before {
@@ -53,12 +55,7 @@
 }
 
 .dx-lookup-field {
-    padding: @MATERIAL_LOOKUP_FIELD_PADDING;
     font-size: @MATERIAL_LOOKUP_FONT_SIZE;
-
-    .dx-rtl & {
-        padding: @MATERIAL_LOOKUP_FIELD_PADDING_RTL;
-    }
 }
 
 .dx-lookup-arrow {

diff --git a/styles/widgets/material/size-schemes/shared/base.less b/styles/widgets/material/size-schemes/shared/base.less
@@ -3,14 +3,10 @@
     @MATERIAL_BASE_INLINE_WIDGET_HEIGHT - @MATERIAL_BASE_INLINE_BLOCK_HEIGHT;
 @MATERIAL_BASE_INLINE_WIDGET_TOP_PADDING:
     floor(@MATERIAL_BASE_INLINE_WIDGET_VERTICAL_PADDING/2);
-@MATERIAL_BASE_INLINE_WIDGET_BOTTOM_PADDING:
-    @MATERIAL_BASE_INLINE_WIDGET_VERTICAL_PADDING - @MATERIAL_BASE_INLINE_WIDGET_TOP_PADDING;
 
 // Base bordered inline widgets sizes
 @MATERIAL_BASE_BORDER_WIDTH: 1px;
 @MATERIAL_BASE_INLINE_BORDEREDWIDGET_INNER_SIZE:
     @MATERIAL_BASE_INLINE_WIDGET_HEIGHT - @MATERIAL_BASE_BORDER_WIDTH * 2;
 @MATERIAL_BASE_INLINE_BORDEREDWIDGET_TOP_PADDING:
     @MATERIAL_BASE_INLINE_WIDGET_TOP_PADDING - @MATERIAL_BASE_BORDER_WIDTH;
-@MATERIAL_BASE_INLINE_BORDEREDWIDGET_BOTTOM_PADDING:
-    @MATERIAL_BASE_INLINE_WIDGET_BOTTOM_PADDING - @MATERIAL_BASE_BORDER_WIDTH;