diff --git a/examples/demo-styles/icon.scss b/examples/demo-styles/icon.scss index 283a65616..3f670b440 100644 --- a/examples/demo-styles/icon.scss +++ b/examples/demo-styles/icon.scss @@ -12,7 +12,7 @@ .page-component .content > ul.icon-list { overflow: hidden; list-style: none; - padding: 0; + padding: 0!important; border: solid 1px #eaeefb; border-radius: 4px; } diff --git a/examples/icon.json b/examples/icon.json index 2df2dfa04..42c607ba0 100644 --- a/examples/icon.json +++ b/examples/icon.json @@ -1 +1 @@ -["platform-eleme","delete-solid","eleme","c-scale-to-original","sort-up","sort-down","upload","goods","video-pause","video-play","s-cooperation","s-order","s-platform","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-help","s-goods","s-marketing","s-kpi","s-comment","s-finance","s-claim","s-tools","s-custom","s-opportunity","s-fold","s-data","s-check","s-grid","user-solid","question","warning","remove","info","circle-plus","picture","location","error","success","camera-solid","d-caret","message-solid","menu","star-on","video-camera-solid","phone","more","share","caret-left","caret-right","caret-bottom","caret-top","date","circle-close-outline","edit","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","download","upload2","takeaway-box","camera","search","zoom-in","zoom-out","monitor","attract","mobile","video-camera","scissors","umbrella","headset","decoration","data-line","mouse","coordinate","magic","reading","data-board","pie-chart","data-analysis","collection-tag","edit-outline","film","suitcase-locked","suitcase","suitcase-1","picture-outline-round","picture-outline","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","home","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","present","box","bank-card","shopping-voucher","coin","wallet-1","discount","tag","medal","bicycle","truck","ship","news","help","guide","female","man","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bell","bangzhu","circle-plus-outline","remove-outline","complete","circle-check-outline","time","odometer","crop","aim","switch-button","full-screen","copy-document","star-off","basketball","football","basketball-1","soccer","baseball","mike","Stopwatch","medal-1","medal-2","trophy","trophy-1","first-aid-kit","discover","place","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer-1","timer-2","timer-3","watch-1","watch-2","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","bottom-left","bottom-right","bottom","back","right","top-left","top-right","top","lock","unlock","user","key","arrow-up","arrow-right","arrow-down","arrow-left","d-arrow-left","d-arrow-right","close","check","plus","minus","delete","merchandise","sold-out","service","mobile-phone","sort","rank","refresh","loading","view","finished","more-outline","phone-outline","setting","warning-outline","refresh-right","refresh-left","dish","dish-1","food","chicken","fork-spoon","knife-fork","knife-and-fork","burger","tableware","sugar","ice-drink","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","starbucks","milk-tea-1","milk-tea-2","milk-tea-3","coffee","potato-strips","lollipop","ice-cream-square","ice-cream-round"] \ No newline at end of file +["platform-eleme","delete-solid","eleme","c-scale-to-original","sort-up","sort-down","upload","goods","video-pause","video-play","s-cooperation","s-order","s-platform","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-help","s-goods","s-marketing","s-kpi","s-comment","s-finance","s-claim","s-tools","s-custom","s-opportunity","s-fold","s-data","s-check","s-grid","user-solid","question","warning","remove","info","circle-plus","picture","location","error","success","camera-solid","d-caret","message-solid","menu","star-on","video-camera-solid","phone","more","share","caret-left","caret-right","caret-bottom","caret-top","date","circle-close-outline","edit","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","download","upload2","takeaway-box","camera","search","zoom-in","zoom-out","monitor","attract","mobile","video-camera","scissors","umbrella","headset","brush","data-line","mouse","coordinate","magic-stick","reading","data-board","pie-chart","data-analysis","collection-tag","edit-outline","film","suitcase","suitcase-1","picture-outline-round","picture-outline","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","house","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","present","box","bank-card","money","coin","wallet","discount","price-tag","bicycle","truck","ship","notification","help","guide","male","female","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bell","bangzhu","circle-plus-outline","remove-outline","circle-check-outline","time","odometer","crop","aim","switch-button","full-screen","copy-document","star-off","basketball","football","soccer","baseball","mic","stopwatch","medal-1","medal","trophy","trophy-1","first-aid-kit","discover","place","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer","watch-1","watch","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","bottom-left","bottom-right","bottom","back","right","top-left","top-right","top","lock","unlock","user","key","arrow-up","arrow-right","arrow-down","arrow-left","d-arrow-left","d-arrow-right","close","check","plus","minus","delete","sold-out","sell","service","mobile-phone","sort","rank","refresh","loading","view","finished","more-outline","phone-outline","setting","warning-outline","refresh-right","refresh-left","dish","dish-1","food","chicken","fork-spoon","knife-fork","burger","tableware","sugar","dessert","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","coffee","ice-tea","ice-drink","milk-tea","potato-strips","lollipop","ice-cream-square","ice-cream-round"] \ No newline at end of file diff --git a/packages/theme-chalk/src/fonts/element-icons.ttf b/packages/theme-chalk/src/fonts/element-icons.ttf index 4d1afca0d..8392df7a1 100644 Binary files a/packages/theme-chalk/src/fonts/element-icons.ttf and b/packages/theme-chalk/src/fonts/element-icons.ttf differ diff --git a/packages/theme-chalk/src/fonts/element-icons.woff b/packages/theme-chalk/src/fonts/element-icons.woff index ce341109b..f0935abe6 100644 Binary files a/packages/theme-chalk/src/fonts/element-icons.woff and b/packages/theme-chalk/src/fonts/element-icons.woff differ diff --git a/packages/theme-chalk/src/icon.scss b/packages/theme-chalk/src/icon.scss index e8147e444..dfebb5d98 100644 --- a/packages/theme-chalk/src/icon.scss +++ b/packages/theme-chalk/src/icon.scss @@ -41,23 +41,19 @@ content: "\e6a5"; } -.el-icon-coffee:before { +.el-icon-milk-tea:before { content: "\e6a6"; } -.el-icon-milk-tea-3:before { +.el-icon-ice-drink:before { content: "\e6a7"; } -.el-icon-milk-tea-2:before { - content: "\e6a8"; -} - -.el-icon-milk-tea-1:before { +.el-icon-ice-tea:before { content: "\e6a9"; } -.el-icon-starbucks:before { +.el-icon-coffee:before { content: "\e6aa"; } @@ -125,7 +121,7 @@ content: "\e6bb"; } -.el-icon-ice-drink:before { +.el-icon-dessert:before { content: "\e6bc"; } @@ -141,10 +137,6 @@ content: "\e6bf"; } -.el-icon-knife-and-fork:before { - content: "\e6c0"; -} - .el-icon-knife-fork:before { content: "\e6c1"; } @@ -225,11 +217,11 @@ content: "\e6d4"; } -.el-icon-sold-out:before { +.el-icon-sell:before { content: "\e6d5"; } -.el-icon-merchandise:before { +.el-icon-sold-out:before { content: "\e6d6"; } @@ -377,7 +369,7 @@ content: "\e6fd"; } -.el-icon-watch-2:before { +.el-icon-watch:before { content: "\e6fe"; } @@ -385,15 +377,7 @@ content: "\e6ff"; } -.el-icon-timer-3:before { - content: "\e700"; -} - -.el-icon-timer-2:before { - content: "\e701"; -} - -.el-icon-timer-1:before { +.el-icon-timer:before { content: "\e702"; } @@ -441,7 +425,7 @@ content: "\e70d"; } -.el-icon-medal-2:before { +.el-icon-medal:before { content: "\e70e"; } @@ -449,11 +433,11 @@ content: "\e70f"; } -.el-icon-Stopwatch:before { +.el-icon-stopwatch:before { content: "\e710"; } -.el-icon-mike:before { +.el-icon-mic:before { content: "\e711"; } @@ -465,10 +449,6 @@ content: "\e713"; } -.el-icon-basketball-1:before { - content: "\e714"; -} - .el-icon-football:before { content: "\e715"; } @@ -513,10 +493,6 @@ content: "\e720"; } -.el-icon-complete:before { - content: "\e721"; -} - .el-icon-remove-outline:before { content: "\e722"; } @@ -609,11 +585,11 @@ content: "\e739"; } -.el-icon-man:before { +.el-icon-female:before { content: "\e73a"; } -.el-icon-female:before { +.el-icon-male:before { content: "\e73b"; } @@ -625,7 +601,7 @@ content: "\e73d"; } -.el-icon-news:before { +.el-icon-notification:before { content: "\e73e"; } @@ -641,11 +617,7 @@ content: "\e741"; } -.el-icon-medal:before { - content: "\e743"; -} - -.el-icon-tag:before { +.el-icon-price-tag:before { content: "\e744"; } @@ -653,7 +625,7 @@ content: "\e745"; } -.el-icon-wallet-1:before { +.el-icon-wallet:before { content: "\e747"; } @@ -661,7 +633,7 @@ content: "\e748"; } -.el-icon-shopping-voucher:before { +.el-icon-money:before { content: "\e749"; } @@ -705,7 +677,7 @@ content: "\e753"; } -.el-icon-home:before { +.el-icon-house:before { content: "\e754"; } @@ -761,10 +733,6 @@ content: "\e761"; } -.el-icon-suitcase-locked:before { - content: "\e762"; -} - .el-icon-film:before { content: "\e763"; } @@ -793,7 +761,7 @@ content: "\e769"; } -.el-icon-magic:before { +.el-icon-magic-stick:before { content: "\e76a"; } @@ -809,7 +777,7 @@ content: "\e76d"; } -.el-icon-decoration:before { +.el-icon-brush:before { content: "\e76e"; }