other / mew-iview

Commit 3b0ded22b4e9a506d52f2bf57ec07febf4b99e5d

Authored by 梁灏
1 parent 1d24fc97

revert https://github.com/iview/iview/commit/d893ebdc1db7c330b0ad5711127fd853bfd53a93

Showing 2 changed files with 8 additions and 4 deletions   Show diff stats
Inline Side-by-side
examples/routers/button.vue
  Show/Hide comments   View file @3b0ded2
@@ -194,6 +194,10 @@ @@ -194,6 +194,10 @@
194 <Button type="default">Large</Button> 194 <Button type="default">Large</Button>
195 <Button type="default">Large</Button> 195 <Button type="default">Large</Button>
196 </Button-group> 196 </Button-group>
  197 + <Button-group size="large">
  198 + <Button type="default">大汉字</Button>
  199 + <Button type="default">大汉字</Button>
  200 + </Button-group>
197 <Button-group> 201 <Button-group>
198 <Button type="default">Default</Button> 202 <Button type="default">Default</Button>
199 <Button type="default">Default</Button> 203 <Button type="default">Default</Button>
@@ -215,6 +219,8 @@ @@ -215,6 +219,8 @@
215 <Button type="default">Small</Button> 219 <Button type="default">Small</Button>
216 <Button type="default">Small</Button> 220 <Button type="default">Small</Button>
217 </Button-group> 221 </Button-group>
  222 +
  223 + <br><br><br><br><br>
218 </div> 224 </div>
219 </template> 225 </template>
220 <script> 226 <script>
src/styles/custom.less
  Show/Hide comments   View file @3b0ded2
@@ -23,10 +23,8 @@ @@ -23,10 +23,8 @@
23 // Base 23 // Base
24 @body-background : #fff; 24 @body-background : #fff;
25 @component-background : #fff; 25 @component-background : #fff;
26 -@font-family : -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC',  
27 -'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif,  
28 -'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';  
29 -@code-family : 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; 26 +@font-family : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
  27 +@code-family : Consolas,Menlo,Courier,monospace;
30 @title-color : #17233d; 28 @title-color : #17233d;
31 @text-color : #515a6e; 29 @text-color : #515a6e;
32 @font-size-base : 14px; 30 @font-size-base : 14px;