Merge branch 'dev' into release_v1.4.0

jd-opensource · Nov 11, 2018 · b481466 · b481466
2 parents 0214a07 + bc4f3b7
commit b481466
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/@types/tag.d.ts b/@types/tag.d.ts
@@ -10,6 +10,8 @@ export interface AtTagProps extends AtComponent{
 
   name?: string
 
+  circle?: boolean
+
   active?: boolean
 
   disabled?: boolean

diff --git a/src/components/drawer/index.scss b/src/components/drawer/index.scss
@@ -25,6 +25,8 @@ $drawer-content-width: 460px;
     text-align: left;
     background-color: $color-bg;
     opacity: 0;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
     z-index: 1;
   }