diff --git a/examples/docs/en-US/button.md b/examples/docs/en-US/button.md
index c11f198e2..6bad26ba8 100644
--- a/examples/docs/en-US/button.md
+++ b/examples/docs/en-US/button.md
@@ -1,17 +1,16 @@
 <style>
   .demo-box.demo-button {
     .el-row {
-      margin-bottom: 10px;
-    }
-    .el-button {
       margin-bottom: 20px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
     .el-button + .el-button {
       margin-left: 10px;
     }
     .el-button-group {
-      margin-bottom: 20px;
-
       .el-button + .el-button {
         margin-left: 0;
       }
@@ -32,41 +31,41 @@ Commonly used button.
 :::demo Use `type`, `plain`, `round` and `circle` to define Button's style.
 
 ```html
-<div>
+<el-row>
   <el-button>Default</el-button>
   <el-button type="primary">Primary</el-button>
   <el-button type="success">Success</el-button>
   <el-button type="info">Info</el-button>
   <el-button type="warning">Warning</el-button>
   <el-button type="danger">Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain>Plain</el-button>
   <el-button type="primary" plain>Primary</el-button>
   <el-button type="success" plain>Success</el-button>
   <el-button type="info" plain>Info</el-button>
   <el-button type="warning" plain>Warning</el-button>
   <el-button type="danger" plain>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button round>Round</el-button>
   <el-button type="primary" round>Primary</el-button>
   <el-button type="success" round>Success</el-button>
   <el-button type="info" round>Info</el-button>
   <el-button type="warning" round>Warning</el-button>
   <el-button type="danger" round>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button icon="el-icon-search" circle></el-button>
   <el-button type="primary" icon="el-icon-edit" circle></el-button>
   <el-button type="success" icon="el-icon-check" circle></el-button>
   <el-button type="info" icon="el-icon-message" circle></el-button>
   <el-button type="warning" icon="el-icon-star-off" circle></el-button>
   <el-button type="danger" icon="el-icon-delete" circle></el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -77,23 +76,23 @@ The `disabled` attribute determines if the button is disabled.
 :::demo Use `disabled` attribute to determine whether a button is disabled. It accepts a `Boolean` value.
 
 ```html
-<div>
+<el-row>
   <el-button disabled>Default</el-button>
   <el-button type="primary" disabled>Primary</el-button>
   <el-button type="success" disabled>Success</el-button>
   <el-button type="info" disabled>Info</el-button>
   <el-button type="warning" disabled>Warning</el-button>
   <el-button type="danger" disabled>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain disabled>Plain</el-button>
   <el-button type="primary" plain disabled>Primary</el-button>
   <el-button type="success" plain disabled>Success</el-button>
   <el-button type="info" plain disabled>Info</el-button>
   <el-button type="warning" plain disabled>Warning</el-button>
   <el-button type="danger" plain disabled>Danger</el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -160,18 +159,18 @@ Besides default size, Button component provides three additional sizes for you t
 :::demo Use attribute `size` to set additional sizes with `medium`, `small` or `mini`.
 
 ```html
-<div>
+<el-row>
   <el-button>Default</el-button>
   <el-button size="medium">Medium</el-button>
   <el-button size="small">Small</el-button>
   <el-button size="mini">Mini</el-button>
-</div>
-<div>
+</el-row>
+<el-row>
   <el-button round>Default</el-button>
   <el-button size="medium" round>Medium</el-button>
   <el-button size="small" round>Small</el-button>
   <el-button size="mini" round>Mini</el-button>
-</div>
+</el-row>
 ```
 :::
 
diff --git a/examples/docs/es/button.md b/examples/docs/es/button.md
index 0310ac622..60e539300 100644
--- a/examples/docs/es/button.md
+++ b/examples/docs/es/button.md
@@ -1,17 +1,16 @@
 <style>
   .demo-box.demo-button {
     .el-row {
-      margin-bottom: 10px;
-    }
-    .el-button {
       margin-bottom: 20px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
     .el-button + .el-button {
       margin-left: 10px;
     }
     .el-button-group {
-      margin-bottom: 20px;
-    
       .el-button + .el-button {
         margin-left: 0;
       }
@@ -32,41 +31,41 @@ Botones comúnmente usados.
 :::demo Use `type`, `plain`,`round` y `circle` para definir estilos a los botones.
 
 ```html
-<div>
+<el-row>
   <el-button>Default</el-button>
   <el-button type="primary">Primary</el-button>
   <el-button type="success">Success</el-button>
   <el-button type="info">Info</el-button>
   <el-button type="warning">Warning</el-button>
   <el-button type="danger">Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain>Plain</el-button>
   <el-button type="primary" plain>Primary</el-button>
   <el-button type="success" plain>Success</el-button>
   <el-button type="info" plain>Info</el-button>
   <el-button type="warning" plain>Warning</el-button>
   <el-button type="danger" plain>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button round>Round</el-button>
   <el-button type="primary" round>Primary</el-button>
   <el-button type="success" round>Success</el-button>
   <el-button type="info" round>Info</el-button>
   <el-button type="warning" round>Warning</el-button>
   <el-button type="danger" round>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button icon="el-icon-search" circle></el-button>
   <el-button type="primary" icon="el-icon-edit" circle></el-button>
   <el-button type="success" icon="el-icon-check" circle></el-button>
   <el-button type="info" icon="el-icon-message" circle></el-button>
   <el-button type="warning" icon="el-icon-star-off" circle></el-button>
   <el-button type="danger" icon="el-icon-delete" circle></el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -77,23 +76,23 @@ El atributo `disabled` determina su un botón esta deshabilitado.
 :::demo Use el atributo `disabled` para determinar si un botón esta deshabilitado. Acepta un valor `Boolean`.
 
 ```html
-<div>
+<el-row>
   <el-button disabled>Default</el-button>
   <el-button type="primary" disabled>Primary</el-button>
   <el-button type="success" disabled>Success</el-button>
   <el-button type="info" disabled>Info</el-button>
   <el-button type="warning" disabled>Warning</el-button>
   <el-button type="danger" disabled>Danger</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain disabled>Plain</el-button>
   <el-button type="primary" plain disabled>Primary</el-button>
   <el-button type="success" plain disabled>Success</el-button>
   <el-button type="info" plain disabled>Info</el-button>
   <el-button type="warning" plain disabled>Warning</el-button>
   <el-button type="danger" plain disabled>Danger</el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -160,18 +159,18 @@ Además del tamaño por defecto, el componente Button provee tres tamaños adici
 :::demo Use el atributo `size` para setear tamaños adicionales con `medium`, `small` or `mini`.
 
 ```html
-<div>
+<el-row>
   <el-button>Default</el-button>
   <el-button size="medium">Medium</el-button>
   <el-button size="small">Small</el-button>
   <el-button size="mini">Mini</el-button>
-</div>
-<div>
+</el-row>
+<el-row>
   <el-button round>Default</el-button>
   <el-button size="medium" round>Medium</el-button>
   <el-button size="small" round>Small</el-button>
   <el-button size="mini" round>Mini</el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -182,9 +181,9 @@ Además del tamaño por defecto, el componente Button provee tres tamaños adici
 | type        | tipo de botón                            | string  | primary / success / warning / danger / info / text | —           |
 | plain       | determinar si es o no un botón plano     | boolean | —                                        | false       |
 | round       | determinar si es o no un botón redondo   | boolean | —                                        | false       |
-| circle      | determinar si es o no un botón circle    | boolean | —                                        | false       |
-| loading     | determinar si es o no un botón de descarga | boolean | —                                        | false       |
+| circle      | determine whether it's a circle button   | boolean | —                                        | false       |
+| loading     | determinar si es o no un botón de descarga | boolean | —                                      | false       |
 | disabled    | deshabilitar el botón                    | boolean | —                                        | false       |
 | icon        | nombre de la clase del icono             | string  | —                                        | —           |
-| autofocus   | misma funcionalidad que la nativa `autofocus` | boolean | —                                        | false       |
+| autofocus   | misma funcionalidad que la nativa `autofocus` | boolean | —                                   | false       |
 | native-type | misma funcionalidad que la nativa `type` | string  | button / submit / reset                  | button      |
\ No newline at end of file
diff --git a/examples/docs/zh-CN/button.md b/examples/docs/zh-CN/button.md
index 3e300d55a..892aa605a 100644
--- a/examples/docs/zh-CN/button.md
+++ b/examples/docs/zh-CN/button.md
@@ -1,17 +1,16 @@
 <style>
   .demo-box.demo-button {
     .el-row {
-      margin-bottom: 10px;
-    }
-    .el-button {
       margin-bottom: 20px;
+      
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
     .el-button + .el-button {
       margin-left: 10px;
     }
     .el-button-group {
-      margin-bottom: 20px;
-
       .el-button + .el-button {
         margin-left: 0;
       }
@@ -33,41 +32,41 @@
 :::demo 使用`type`、`plain`、`round`和`circle`属性来定义 Button 的样式。
 
 ```html
-<div>
+<el-row>
   <el-button>默认按钮</el-button>
   <el-button type="primary">主要按钮</el-button>
   <el-button type="success">成功按钮</el-button>
   <el-button type="info">信息按钮</el-button>
   <el-button type="warning">警告按钮</el-button>
   <el-button type="danger">危险按钮</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain>朴素按钮</el-button>
   <el-button type="primary" plain>主要按钮</el-button>
   <el-button type="success" plain>成功按钮</el-button>
   <el-button type="info" plain>信息按钮</el-button>
   <el-button type="warning" plain>警告按钮</el-button>
   <el-button type="danger" plain>危险按钮</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button round>圆角按钮</el-button>
   <el-button type="primary" round>主要按钮</el-button>
   <el-button type="success" round>成功按钮</el-button>
   <el-button type="info" round>信息按钮</el-button>
   <el-button type="warning" round>警告按钮</el-button>
   <el-button type="danger" round>危险按钮</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button icon="el-icon-search" circle></el-button>
   <el-button type="primary" icon="el-icon-edit" circle></el-button>
   <el-button type="success" icon="el-icon-check" circle></el-button>
   <el-button type="info" icon="el-icon-message" circle></el-button>
   <el-button type="warning" icon="el-icon-star-off" circle></el-button>
   <el-button type="danger" icon="el-icon-delete" circle></el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -78,23 +77,23 @@
 :::demo 你可以使用`disabled`属性来定义按钮是否可用，它接受一个`Boolean`值。
 
 ```html
-<div>
+<el-row>
   <el-button disabled>默认按钮</el-button>
   <el-button type="primary" disabled>主要按钮</el-button>
   <el-button type="success" disabled>成功按钮</el-button>
   <el-button type="info" disabled>信息按钮</el-button>
   <el-button type="warning" disabled>警告按钮</el-button>
   <el-button type="danger" disabled>危险按钮</el-button>
-</div>
+</el-row>
 
-<div>
+<el-row>
   <el-button plain disabled>朴素按钮</el-button>
   <el-button type="primary" plain disabled>主要按钮</el-button>
   <el-button type="success" plain disabled>成功按钮</el-button>
   <el-button type="info" plain disabled>信息按钮</el-button>
   <el-button type="warning" plain disabled>警告按钮</el-button>
   <el-button type="danger" plain disabled>危险按钮</el-button>
-</div>
+</el-row>
 ```
 :::
 
@@ -161,18 +160,18 @@ Button 组件提供除了默认值以外的三种尺寸，可以在不同场景
 :::demo 额外的尺寸：`medium`、`small`、`mini`，通过设置`size`属性来配置它们。
 
 ```html
-<div>
+<el-row>
   <el-button>默认按钮</el-button>
   <el-button size="medium">中等按钮</el-button>
   <el-button size="small">小型按钮</el-button>
   <el-button size="mini">超小按钮</el-button>
-</div>
-<div>
+</el-row>
+<el-row>
   <el-button round>默认按钮</el-button>
   <el-button size="medium" round>中等按钮</el-button>
   <el-button size="small" round>小型按钮</el-button>
   <el-button size="mini" round>超小按钮</el-button>
-</div>
+</el-row>
 ```
 :::
 
diff --git a/packages/theme-chalk/src/time-picker.scss b/packages/theme-chalk/src/time-picker.scss
index 58c411486..10aaf54f6 100644
--- a/packages/theme-chalk/src/time-picker.scss
+++ b/packages/theme-chalk/src/time-picker.scss
@@ -1,6 +1,8 @@
 @import "./date-picker/picker.scss";
+@import "./date-picker/picker-panel.scss";
 @import "./date-picker/time-spinner.scss";
 @import "./date-picker/time-picker.scss";
+@import "./date-picker/time-range-picker.scss";
 @import "./input.scss";
 @import "./scrollbar.scss";
 @import "./popper";