Commit 6c145a0466f47f45985be735b32c6f701a98a68f
1 parent
f2be585e
fixed #77
fixed #77
Showing
6 changed files
with
15 additions
and
3 deletions
Show diff stats
dist/styles/article.css
1 | -.ivu-article h1{font-size:26px;font-weight:400}.ivu-article h2{font-size:20px;font-weight:400}.ivu-article h3{font-size:16px;font-weight:400}.ivu-article h4{font-size:14px;font-weight:400}.ivu-article h5,.ivu-article h6{font-size:12px;font-weight:400}.ivu-article blockquote{padding:5px 5px 3px 10px;line-height:1.5;border-left:4px solid #ddd;margin-bottom:20px;color:#666;font-size:14px}.ivu-article ul{padding-left:40px;list-style-type:disc}.ivu-article li{margin-bottom:5px;font-size:14px}.ivu-article ol ul,.ivu-article ul ul{list-style-type:circle}.ivu-article p{margin:5px;font-size:14px} | ||
2 | \ No newline at end of file | 1 | \ No newline at end of file |
2 | +.ivu-article h1{font-size:26px;font-weight:400}.ivu-article h2{font-size:20px;font-weight:400}.ivu-article h3{font-size:16px;font-weight:400}.ivu-article h4{font-size:14px;font-weight:400}.ivu-article h5,.ivu-article h6{font-size:12px;font-weight:400}.ivu-article blockquote{padding:5px 5px 3px 10px;line-height:1.5;border-left:4px solid #ddd;margin-bottom:20px;color:#666;font-size:14px}.ivu-article ul{padding-left:40px;list-style-type:disc}.ivu-article li{margin-bottom:5px;font-size:14px}.ivu-article ol ul,.ivu-article ul ul{list-style-type:circle}.ivu-article p{margin:5px;font-size:14px}.ivu-article a[target="_blank"]:after{content:"\F220";font-family:Ionicons;color:#aaa;margin-left:2px} | ||
3 | \ No newline at end of file | 3 | \ No newline at end of file |
src/components/input/input.vue
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <div :class="[prefixCls + '-group-prepend']" v-if="prepend" v-el:prepend><slot name="prepend"></slot></div> | 4 | <div :class="[prefixCls + '-group-prepend']" v-if="prepend" v-el:prepend><slot name="prepend"></slot></div> |
5 | <i class="ivu-icon" :class="['ivu-icon-' + icon, prefixCls + '-icon']" v-if="icon" @click="handleIconClick"></i> | 5 | <i class="ivu-icon" :class="['ivu-icon-' + icon, prefixCls + '-icon']" v-if="icon" @click="handleIconClick"></i> |
6 | <input | 6 | <input |
7 | - type="text" | 7 | + :type="type" |
8 | :class="inputClasses" | 8 | :class="inputClasses" |
9 | :placeholder="placeholder" | 9 | :placeholder="placeholder" |
10 | :disabled="disabled" | 10 | :disabled="disabled" |
@@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
37 | props: { | 37 | props: { |
38 | type: { | 38 | type: { |
39 | validator (value) { | 39 | validator (value) { |
40 | - return oneOf(value, ['text', 'textarea']); | 40 | + return oneOf(value, ['text', 'textarea', 'password']); |
41 | }, | 41 | }, |
42 | default: 'text' | 42 | default: 'text' |
43 | }, | 43 | }, |
src/styles/article/index.less
@@ -49,4 +49,11 @@ | @@ -49,4 +49,11 @@ | ||
49 | margin: 5px; | 49 | margin: 5px; |
50 | font-size: 14px; | 50 | font-size: 14px; |
51 | } | 51 | } |
52 | + | ||
53 | + a[target="_blank"]:after{ | ||
54 | + content: "\F220"; | ||
55 | + font-family: Ionicons; | ||
56 | + color: #aaa; | ||
57 | + margin-left: 3px; | ||
58 | + } | ||
52 | } | 59 | } |
53 | \ No newline at end of file | 60 | \ No newline at end of file |
test/app.vue
1 | <style lang="less"> | 1 | <style lang="less"> |
2 | @import "../src/styles/index.less"; | 2 | @import "../src/styles/index.less"; |
3 | @import "../src/styles/package.less"; | 3 | @import "../src/styles/package.less"; |
4 | + @import "../src/styles/article/index.less"; | ||
4 | </style> | 5 | </style> |
5 | <style scoped> | 6 | <style scoped> |
6 | nav { | 7 | nav { |
test/routers/input.vue
@@ -74,6 +74,7 @@ | @@ -74,6 +74,7 @@ | ||
74 | <Input-number :value="2" size="small"></Input-number> | 74 | <Input-number :value="2" size="small"></Input-number> |
75 | <Input-number :value="2"></Input-number> | 75 | <Input-number :value="2"></Input-number> |
76 | <Input-number :value="2" size="large"></Input-number> | 76 | <Input-number :value="2" size="large"></Input-number> |
77 | + <i-input type="password"></i-input> | ||
77 | </div> | 78 | </div> |
78 | </template> | 79 | </template> |
79 | <script> | 80 | <script> |
test/routers/slider.vue
@@ -9,6 +9,9 @@ | @@ -9,6 +9,9 @@ | ||
9 | <!--<Slider :step="13" :max="60"></Slider>--> | 9 | <!--<Slider :step="13" :max="60"></Slider>--> |
10 | <Icon type="checkmark-circled" size="40" color="#f60"></Icon> | 10 | <Icon type="checkmark-circled" size="40" color="#f60"></Icon> |
11 | <p>附近的首付款是东方红看就是</p> | 11 | <p>附近的首付款是东方红看就是</p> |
12 | + <div class="ivu-article"> | ||
13 | + <a href="http://www.iviewui.com" target="_blank">iView</a> | ||
14 | + </div> | ||
12 | </div> | 15 | </div> |
13 | </template> | 16 | </template> |
14 | <script> | 17 | <script> |