Merge branch 'dev'

Revert "fix: 增加控制型svg图标，确保ios16的锁定模式下这些图标能正常显示"

CHANGELOG.en-US.md

@@ -22,7 +22,7 @@ toc: hidden
 
 ### 2.6.1
 
-`2022-02-02`
+`2023-02-02`
 
 - Design
   - 🍭 Financial design specification update

components/captcha/demo/index.vue

@@ -9,13 +9,12 @@
 	</div>
 </template>
 
-<script>
-import createDemoModule from '../../../examples/create-demo-module'
+<script>
import createDemoModule from '../../../examples/create-demo-module'
 import Demo0 from './cases/demo0'
 import Demo1 from './cases/demo1'
 import Demo2 from './cases/demo2'
 export default {...createDemoModule('captcha', [Demo0, Demo1, Demo2])}
-</script>
+
</script>
 
 <style lang="stylus">
 .md-example.captcha

components/codebox/index.vue

@@ -82,8 +82,7 @@
   </div>
 </template>
 
-<script>
-import NumberKeyboard from '../number-keyboard'
+<script>
import NumberKeyboard from '../number-keyboard'
 
 export default {
   name: 'md-codebox',
@@ -252,8 +251,7 @@ export default {
     },
   },
 }
-
-</script>
+
</script>
 
 <style lang="stylus">
 .md-codebox-wrapper

components/icon/index.vue

@@ -71,7 +71,7 @@ export default {
     -webkit-font-smoothing antialiased
     -moz-osx-font-smoothing grayscale
     &.xss
-      font-size icon-size-xss
+      font-size icon-size-xxs
     &.xs
       font-size icon-size-xs
     &.sm
@@ -85,18 +85,21 @@ export default {
       z-index 2
 
   &.icon-svg
-    width 1em
-    vertical-height(1em)
     &.xss
-      font-size icon-size-xss
+      width icon-size-xxs
+      vertical-height(icon-size-xxs)
     &.xs
-      font-size icon-size-xs
+      width icon-size-xs
+      vertical-height(icon-size-xs)
     &.sm
-      font-size icon-size-sm
+      width icon-size-sm
+      vertical-height(icon-size-sm)
     &.md
-      font-size icon-size-md
+      width icon-size-md
+      vertical-height(icon-size-md)
     &.lg
-      font-size icon-size-lg
+      width icon-size-lg
+      vertical-height(icon-size-lg)
 
 // name
 .md-icon-arrow:before

components/popup/title-bar.vue

@@ -77,8 +77,7 @@
   </div>
 </template>
 
-<script>
-import titleBarMixin from './mixins/title-bar'
+<script>
import titleBarMixin from './mixins/title-bar'
 import Icon from '../icon'
 
 export default {
@@ -134,8 +133,7 @@ export default {
     },
   },
 }
-
-</script>
+
</script>
 
 <style lang="stylus" scoped>
 .md-popup-title-bar