Skip to content

Commit

Permalink
fix: http icons + refactor
Browse files Browse the repository at this point in the history
* move icon fonts into modules
* add weloveiconfonts.com icons to project directly
  • Loading branch information
asvae committed Oct 10, 2018
1 parent 759a4a1 commit 5f4426d
Show file tree
Hide file tree
Showing 59 changed files with 6,797 additions and 118 deletions.
2 changes: 1 addition & 1 deletion build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const webpackConfig = merge(baseWebpackConfig, {
chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
},
plugins: [
// http://vuejs.github.io/vue-loader/en/workflow/production.html
// https://vuejs.github.io/vue-loader/en/workflow/production.html
new webpack.DefinePlugin({
'process.env': env
}),
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"dev-old": "node build/dev-server.js",
"build-old": "node build/build.js"
"build-old": "node build/build.js",
"inspect": "vue-cli-service inspect > inspect.js"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/404-pages/MadeByComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="made-by-component">
<span>
©2018. Made by
<a href="http://epicmax.co">Epicmax</a>
<a href="https://epicmax.co">Epicmax</a>
</span>
</div>
</template>
Expand Down
17 changes: 15 additions & 2 deletions src/components/ui/icons/Icons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@
<script>
import FullSet from './Set'
const iconTypes = [
'vuestic',
'brandico',
'entypo',
'font-awesome',
'fontelico',
'glyphicons',
'iconic-stroke',
'ionicons',
'maki',
'openweb'
]
export default {
name: 'icons',
components: {
Expand All @@ -15,8 +28,8 @@ export default {
computed: {
sets () {
let sets = []
require(this.setsPath + 'names.json').forEach(name => {
let set = require(this.setsPath + name + '.json')
iconTypes.forEach(iconType => {
let set = require('./sets/' + iconType + '.json')
this.addfilteredListsTo(set)
sets.push(set)
})
Expand Down
12 changes: 0 additions & 12 deletions src/components/ui/icons/sets/names.json

This file was deleted.

13 changes: 1 addition & 12 deletions src/vuestic-theme/vuestic-sass/icons/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,9 @@
@font-face {
font-family: 'Glyphicons Halflings';
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('eot'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
}

@font-face {
font-family: 'Vuestic Icons';
src: url('#{$icon-font-path}/Glyphter.eot');
src: url('#{$icon-font-path}/Glyphter.eot?#iefix') format('embedded-opentype'),
url('#{$icon-font-path}/Glyphter.woff') format('woff'),
url('#{$icon-font-path}/Glyphter.ttf') format('truetype'),
url('#{$icon-font-path}/Glyphter.svg#Glyphter') format('svg');
font-weight: normal;
font-style: normal;
}
89 changes: 2 additions & 87 deletions src/vuestic-theme/vuestic-sass/icons/_vuestic-icons.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import url(http://weloveiconfonts.com/api/?family=brandico|entypo|fontelico|iconicfill|iconicstroke|maki|openwebicons|typicons|zocial);
// Removed because does not support https.
@import "icon-fonts/icon-fonts";

.i-nav-notification {
display: inline-block;
Expand Down Expand Up @@ -28,92 +29,6 @@
background: url('assets/icons/menu-collapsed.svg') no-repeat center center;
}

.vuestic-icon {
line-height: 1;
}

/* brandico */
[class*="brandico-"]:before {
font-family: 'brandico', sans-serif;
font-style: normal;
}

/* entypo */
[class*="entypo-"]:before {
font-family: 'entypo', sans-serif;
font-style: normal;
}

/* fontelico */
[class*="fontelico-"]:before {
font-family: 'fontelico', sans-serif;
font-style: normal;
}

/* iconicfill */
[class*="iconicfill-"]:before {
font-family: 'IconicFill', sans-serif;
font-style: normal;
}

/* iconicstroke */
[class*="iconicstroke-"]:before {
font-family: 'IconicStroke', sans-serif;
font-style: normal;
}

/* maki */
[class*="maki-"]:before {
font-family: 'maki', sans-serif;
font-style: normal;
}

/* openwebicons */
[class*="openwebicons-"]:before {
font-family: 'OpenWeb Icons', sans-serif;
font-style: normal;
}

/* typicons */
[class*="typicons-"]:before {
font-family: 'Typicons', sans-serif;
font-style: normal;
}

/* zocial */
[class*="zocial-"]:before {
font-family: 'zocial', sans-serif;
}

.vuestic-icon:before{
display: inline-block;
font-family: 'Vuestic Icons';
font-style: normal;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale
}

.vuestic-icon-comments:before{content:'\0041';}
.vuestic-icon-components:before{content:'\0042';}
.vuestic-icon-dashboard:before{content:'\0043';}
.vuestic-icon-extras:before{content:'\0044';}
.vuestic-icon-files:before{content:'\0045';}
.vuestic-icon-forms:before{content:'\0046';}
.vuestic-icon-graph:before{content:'\0047';}
.vuestic-icon-auth:before{content:'\0048';}
.vuestic-icon-image:before{content:'\0049';}
.vuestic-icon-maps:before{content:'\004a';}
.vuestic-icon-music:before{content:'\004b';}
.vuestic-icon-settings:before{content:'\004c';}
.vuestic-icon-statistics:before{content:'\004d';}
.vuestic-icon-tables:before{content:'\004e';}
.vuestic-icon-time:before{content:'\004f';}
.vuestic-icon-ui-elements:before{content:'\0050';}
.vuestic-icon-user:before{content:'\0051';}
.vuestic-icon-video:before{content:'\0052';}

// Catchall baseclass
.glyphicon {
position: relative;
Expand Down
Binary file not shown.
143 changes: 143 additions & 0 deletions src/vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
@font-face {
font-family: 'brandico';
font-style: normal;
font-weight: normal;
src: url('vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.eot');
src: url('vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.eot#iefix') format('eot'),
url('vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.woff') format('woff'),
url('vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.ttf') format('truetype'),
url('vuestic-theme/vuestic-sass/icons/icon-fonts/brandico/brandico.svg#brandico') format('svg');
}

[class*="brandico-"]:before {
font-family: 'brandico', sans-serif;
font-style: normal;
}

.brandico-facebook:before {
content: "\f300"
}

.brandico-facebook-rect:before {
content: "\f301"
}

.brandico-twitter:before {
content: "\f302"
}

.brandico-twitter-bird:before {
content: "\f303"
}

.brandico-vimeo:before {
content: "\f30f"
}

.brandico-vimeo-rect:before {
content: "\f30e"
}

.brandico-tumblr:before {
content: "\f311"
}

.brandico-tumblr-rect:before {
content: "\f310"
}

.brandico-googleplus-rect:before {
content: "\f309"
}

.brandico-github-text:before {
content: "\f307"
}

.brandico-github:before {
content: "\f308"
}

.brandico-skype:before {
content: "\f30b"
}

.brandico-icq:before {
content: "\f304"
}

.brandico-yandex:before {
content: "\f305"
}

.brandico-yandex-rect:before {
content: "\f306"
}

.brandico-vkontakte-rect:before {
content: "\f30a"
}

.brandico-odnoklassniki:before {
content: "\f30c"
}

.brandico-odnoklassniki-rect:before {
content: "\f30d"
}

.brandico-friendfeed:before {
content: "\f312"
}

.brandico-friendfeed-rect:before {
content: "\f313"
}

.brandico-blogger:before {
content: "\f314"
}

.brandico-blogger-rect:before {
content: "\f315"
}

.brandico-deviantart:before {
content: "\f316"
}

.brandico-jabber:before {
content: "\f317"
}

.brandico-lastfm:before {
content: "\f318"
}

.brandico-lastfm-rect:before {
content: "\f319"
}

.brandico-linkedin:before {
content: "\f31a"
}

.brandico-linkedin-rect:before {
content: "\f31b"
}

.brandico-picasa:before {
content: "\f31c"
}

.brandico-wordpress:before {
content: "\f31d"
}

.brandico-instagram:before {
content: "\f31e"
}

.brandico-instagram-filled:before {
content: "\f31f"
}
Loading

0 comments on commit 5f4426d

Please sign in to comment.