Skip to content

Commit

Permalink
iconfont文件换成相对路径
Browse files Browse the repository at this point in the history
  • Loading branch information
@zengyue
zengyue committed May 23, 2014
1 parent 848a6e8 commit 4b50123
Show file tree
Hide file tree
Showing 14 changed files with 734 additions and 16 deletions.
2 changes: 1 addition & 1 deletion assets/css/bs3/dpl-min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/css/bs3/dpl.css
View file
Expand Up @@ -1421,8 +1421,8 @@ fieldset[disabled] .x-icon-question.active {
} }
@font-face { @font-face {
font-family: 'bui-iconfont'; font-family: 'bui-iconfont';
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot'); src: url('../../img/iconfont/iconfont.eot');
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('http://at.alicdn.com/t/font_1395889527_6888435.woff') format('woff'), /* chrome、firefox */ url('http://at.alicdn.com/t/font_1395889527_5368805.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('http://at.alicdn.com/t/font_1395889527_7487144.svg#iconfont') format('svg'); src: url('../../img/iconfont/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../../img/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ url('../../img/iconfont/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('../../img/iconfont/iconfont.svg#iconfont') format('svg');


/* IE9*/ /* IE9*/
/* iOS 4.1- */ /* iOS 4.1- */
Expand Down Expand Up @@ -1953,10 +1953,10 @@ fieldset[disabled] .x-icon-question.active {
background-position: -1px -218px; background-position: -1px -218px;
} }
.icon-caret-left { .icon-caret-left {
background-position: -1px -227px; background-position: -1px -226.99999999px;
} }
.icon-caret-right { .icon-caret-right {
background-position: -1px -234.99999999px; background-position: -1px -235px;
} }
.icon-caret-left-top { .icon-caret-left-top {
background-position: -1px -244px; background-position: -1px -244px;
Expand Down
10 changes: 5 additions & 5 deletions assets/css/bs3/less/base/iconfont.less
View file
Expand Up @@ -3,11 +3,11 @@
// Import the fonts // Import the fonts
@font-face { @font-face {
font-family: 'bui-iconfont'; font-family: 'bui-iconfont';
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot'); /* IE9*/ src: url('../../img/iconfont/iconfont.eot'); /* IE9*/
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ src: url('../../img/iconfont/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('http://at.alicdn.com/t/font_1395889527_6888435.woff') format('woff'), /* chrome、firefox */ url('../../img/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */
url('http://at.alicdn.com/t/font_1395889527_5368805.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('../../img/iconfont/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url('http://at.alicdn.com/t/font_1395889527_7487144.svg#iconfont') format('svg'); /* iOS 4.1- */ url('../../img/iconfont/iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */
} }


// Catchall baseclass // Catchall baseclass
Expand Down
Binary file added assets/img/iconfont/iconfont.eot
View file
Binary file not shown.
359 changes: 359 additions & 0 deletions assets/img/iconfont/iconfont.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/iconfont/iconfont.ttf
View file
Binary file not shown.
Binary file added assets/img/iconfont/iconfont.woff
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion build.xml
View file
Expand Up @@ -107,7 +107,7 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${des.dir}/img"> <copy todir="${des.dir}/img">
<fileset dir="${base.dir}/assets/img" includes="*.*"> <fileset dir="${base.dir}/assets/img" includes="**/*.*">
</fileset> </fileset>
</copy> </copy>


Expand Down
2 changes: 1 addition & 1 deletion build/css/bs3/dpl-min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions build/css/bs3/dpl.css
View file
Expand Up @@ -1421,8 +1421,8 @@ fieldset[disabled] .x-icon-question.active {
} }
@font-face { @font-face {
font-family: 'bui-iconfont'; font-family: 'bui-iconfont';
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot'); src: url('../../img/iconfont/iconfont.eot');
src: url('http://at.alicdn.com/t/font_1395889527_662993.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('http://at.alicdn.com/t/font_1395889527_6888435.woff') format('woff'), /* chrome、firefox */ url('http://at.alicdn.com/t/font_1395889527_5368805.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('http://at.alicdn.com/t/font_1395889527_7487144.svg#iconfont') format('svg'); src: url('../../img/iconfont/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../../img/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ url('../../img/iconfont/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('../../img/iconfont/iconfont.svg#iconfont') format('svg');


/* IE9*/ /* IE9*/
/* iOS 4.1- */ /* iOS 4.1- */
Expand Down Expand Up @@ -1953,10 +1953,10 @@ fieldset[disabled] .x-icon-question.active {
background-position: -1px -218px; background-position: -1px -218px;
} }
.icon-caret-left { .icon-caret-left {
background-position: -1px -227px; background-position: -1px -226.99999999px;
} }
.icon-caret-right { .icon-caret-right {
background-position: -1px -234.99999999px; background-position: -1px -235px;
} }
.icon-caret-left-top { .icon-caret-left-top {
background-position: -1px -244px; background-position: -1px -244px;
Expand Down
Binary file added build/img/iconfont/iconfont.eot
View file
Binary file not shown.
359 changes: 359 additions & 0 deletions build/img/iconfont/iconfont.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/img/iconfont/iconfont.ttf
View file
Binary file not shown.
Binary file added build/img/iconfont/iconfont.woff
View file
Binary file not shown.

0 comments on commit 4b50123

Please sign in to comment.