Merge 8a1f6f2 into 03a9819

vaadin · Feb 23, 2021 · 7b8ecb6 · 7b8ecb6
2 parents 03a9819 + 8a1f6f2
commit 7b8ecb6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 dist: xenial
 language: node_js
-node_js: 8.11
+node_js: 10.23
 
 cache:
   directories:

diff --git a/test/visual/no-padding.html b/test/visual/no-padding.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+<head lang="en">
+  <meta charset="UTF-8" />
+  <title>Dialog tests</title>
+  <script>
+    window.polymerSkipLoadingFontRoboto = true;
+  </script>
+  <script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+  <script>
+    const theme = window.location.search.replace(/.*theme=(\w+).*/, '$1') || 'lumo';
+    document.write(`<link rel="import" href="../../theme/${theme}/vaadin-dialog.html">`);
+  </script>
+</head>
+
+<body style="height: 600px">
+  <vaadin-dialog theme="no-padding" opened>
+    <template>
+      <div>A very simple dialog with no padding</div>
+      <button>OK</button>
+    </template>
+  </vaadin-dialog>
+
+</body>
diff --git a/test/visual/screens/vaadin-dialog/lumo-no-padding.png b/test/visual/screens/vaadin-dialog/lumo-no-padding.png
diff --git a/test/visual/screens/vaadin-dialog/material-no-padding.png b/test/visual/screens/vaadin-dialog/material-no-padding.png
diff --git a/test/visual/test.js b/test/visual/test.js
@@ -14,13 +14,22 @@ gemini.suite('vaadin-dialog', function(rootSuite) {
     .before(wait)
     .after(goToAboutBlank);
 
+  const locator = 'body[data-ready]';
+
   ['lumo', 'material'].forEach(theme => {
     gemini.suite(`default-tests-${theme}`, function(suite) {
       suite
         .setUrl(`default.html?theme=${theme}`)
         .setCaptureElements('body')
         .capture('dialog');
     });
+
+    it(`${theme}-no-padding`, function() {
+      return this.browser
+        .url(`no-padding.html?theme=${theme}`)
+        .waitForVisible(locator, 15000)
+        .assertView(`${theme}-no-padding`, locator);
+    });
   });
 
 });
diff --git a/theme/lumo/vaadin-dialog-styles.html b/theme/lumo/vaadin-dialog-styles.html
@@ -27,6 +27,11 @@
         padding: var(--lumo-space-l);
       }
 
+      /* No padding */
+      :host([theme~='no-padding']) [part='content'] {
+        padding: 0;
+      }
+
       /* Animations */
 
       :host([opening]),

diff --git a/theme/material/vaadin-dialog-styles.html b/theme/material/vaadin-dialog-styles.html
@@ -15,6 +15,11 @@
       [part="content"] {
         padding: 24px;
       }
+
+      /* No padding */
+      :host([theme~='no-padding']) [part='content'] {
+        padding: 0;
+      }
     </style>
   </template>
 </dom-module>