Skip to content

Commit

Permalink
fontawesome icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@star7th
star7th committed Jun 7, 2023
1 parent 0feacad commit 4e770bd
Show file tree
Hide file tree
Showing 29 changed files with 183 additions and 410 deletions.
2 changes: 1 addition & 1 deletion web/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
'../server/index.php?s=',
// "lang" :'en'
lang: 'zh-cn'
}</script><link href=./static/css/app.655920584f9944a4a79a58899344deb2.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.339f5a1f86786a88b9d4.js></script><script type=text/javascript src=./static/js/app.65fa0b65c5b239b06cb0.js></script></body></html>
}</script><link href=./static/css/app.47ad1c4d974c2a2d7e03a5909f7236f1.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.339f5a1f86786a88b9d4.js></script><script type=text/javascript src=./static/js/app.ef5ada911e85f6c62096.js></script></body></html>
34 changes: 34 additions & 0 deletions web/static/css/app.47ad1c4d974c2a2d7e03a5909f7236f1.css
View file

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions web/static/css/app.655920584f9944a4a79a58899344deb2.css
View file

This file was deleted.

2 changes: 1 addition & 1 deletion web/static/css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ li {
.v3-font-size-lg{
font-size: 24px;
}
.v3-font-size-sm{
.v3-font-size-sm,.v3-font-size-s{
font-size: 11px;
}
.v3-color-primary{
Expand Down
Binary file added web/static/fonts/fa-regular-400.d363ea5.woff2
View file
Binary file not shown.
Binary file added web/static/fonts/fa-regular-400.ea17b87.ttf
View file
Binary file not shown.
Binary file added web/static/fonts/fa-solid-900.a208a28.woff2
View file
Binary file not shown.
Binary file added web/static/fonts/fa-solid-900.e0edc62.ttf
View file
Binary file not shown.
1 change: 0 additions & 1 deletion web/static/js/app.65fa0b65c5b239b06cb0.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions web/static/js/app.ef5ada911e85f6c62096.js
View file

Large diffs are not rendered by default.

67 changes: 3 additions & 64 deletions web_src/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions web_src/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@
"build": "node build/build.js"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/pro-light-svg-icons": "^6.4.0",
"@fortawesome/pro-regular-svg-icons": "^6.4.0",
"@fortawesome/pro-solid-svg-icons": "^6.4.0",
"@fortawesome/vue-fontawesome": "^2.0.10",
"@fortawesome/fontawesome-pro": "^6.4.0",
"axios": "^0.21.3",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
Expand Down
19 changes: 19 additions & 0 deletions web_src/src/assets/fontawesome.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Import Font Awesome 5 Pro
$fa-font-path: '~@fortawesome/fontawesome-pro/webfonts';
// $fa-css-prefix: 'el-icon-fa';
@import '~@fortawesome/fontawesome-pro/scss/fontawesome.scss';
// @import '~@fortawesome/fontawesome-pro/scss/light.scss';
@import '~@fortawesome/fontawesome-pro/scss/regular.scss';
@import '~@fortawesome/fontawesome-pro/scss/solid.scss';
// @import '~@fortawesome/fontawesome-pro/scss/brands.scss';

// Override Element UI's icon font
// .fal,
// .far,
// .fas {
// font-family: 'Font Awesome 5 Pro' !important;
// }

// .fab {
// font-family: 'Font Awesome 5 Brands' !important;
// }
8 changes: 6 additions & 2 deletions web_src/src/components/common/Sdialog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default {
},
data() {
return {
dialogVisible: true
dialogVisible: false
}
},
methods: {
Expand All @@ -194,7 +194,11 @@ export default {
this.$router.push({ path: '/item/index' })
}
},
mounted() {}
mounted() {
setTimeout(() => {
this.dialogVisible = true
}, 200)
}
}
</script>

Expand Down
34 changes: 8 additions & 26 deletions web_src/src/components/item/add/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@
<el-dropdown trigger="hover" :show-timeout="0">
<div class="el-dropdown-link">
<div class="create-item-btn">
<font-awesome-icon class=" ml-6 mr-2" :icon="['fas', 'plus']" />
<i class="ml-6 mr-2 fas fa-plus"></i>
<span>{{ $t('create_new_item') }}</span>
<span class="line"></span>
<font-awesome-icon class=" ml-10" :icon="['fas', 'ellipsis']" />
<i class=" ml-10 far fa-ellipsis"></i>
</div>
</div>
<el-dropdown-menu class="more-drd" slot="dropdown">
<el-dropdown-item class="more-drd-item" @click.native="regularItem">
<div class="mt-2 mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class=" font-icon mr-2"
:icon="['fas', 'files']"
/>
<i class="font-icon mr-2 fas fa-files"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">{{ $t('regular_item') }}</div>
Expand All @@ -29,10 +26,7 @@
<el-dropdown-item class="more-drd-item" @click.native="singleItem">
<div class="mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class="font-icon mr-2"
:icon="['fas', 'file']"
/>
<i class="font-icon mr-2 fas fa-file"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">
Expand All @@ -47,10 +41,7 @@
<el-dropdown-item class="more-drd-item" @click.native="tableItem">
<div class="mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class="font-icon mr-2"
:icon="['fas', 'table']"
/>
<i class="font-icon mr-2 fas fa-table"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">
Expand All @@ -65,10 +56,7 @@
<el-dropdown-item class="more-drd-item" @click.native="importFile">
<div class="mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class="font-icon mr-2"
:icon="['fas', 'upload']"
/>
<i class="font-icon mr-2 fas fa-upload"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">{{ $t('import_file') }}</div>
Expand All @@ -81,10 +69,7 @@
<el-dropdown-item class="more-drd-item" @click.native="copyItem">
<div class="mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class="font-icon mr-2"
:icon="['fas', 'copy']"
/>
<i class="font-icon mr-2 fas fa-copy"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">{{ $t('copy_item') }}</div>
Expand All @@ -97,10 +82,7 @@
<el-dropdown-item class="more-drd-item" @click.native="autoCreate">
<div class="mb-2">
<div class="inline-block align-middle">
<font-awesome-icon
class="font-icon mr-2"
:icon="['fas', 'terminal']"
/>
<i class="font-icon mr-2 fas fa-terminal"></i>
</div>
<div class="inline-block align-middle">
<div class="font-bold leading-6">{{ $t('auto_create') }}</div>
Expand Down
27 changes: 12 additions & 15 deletions web_src/src/components/item/home/HeaderRight.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<div>
<el-tooltip effect="dark" :content="$t('feedback')" placement="top">
<div @click="feedback" class="icon-item">
<font-awesome-icon :icon="['fas', 'phone']" />
<i class="fas fa-phone"></i>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('team_mamage')" placement="top">
<div @click="showTeam = true" class="icon-item">
<font-awesome-icon :icon="['fas', 'flag']" />
<i class="fas fa-flag"></i>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('my_attachment')" placement="top">
<div @click="showAttachment = true" class="icon-item">
<font-awesome-icon :icon="['fas', 'cloud-arrow-up']" />
<i class="fas fa-cloud-arrow-up"></i>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('my_notice')" placement="top">
Expand All @@ -27,13 +27,13 @@
class="icon-item"
>
<el-badge :value="$store.state.new_msg ? 'New' : ''">
<font-awesome-icon :icon="['fas', 'bell']" />
<i class="fas fa-bell"></i>
</el-badge>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('user_center')" placement="top">
<div @click="showUserSetting = true" class="icon-item">
<font-awesome-icon :icon="['fas', 'user']" />
<i class="fas fa-user"></i>
</div>
</el-tooltip>
<el-tooltip
Expand All @@ -46,7 +46,7 @@
@click="toOutLink('https://www.showdoc.com.cn/clients')"
class="icon-item"
>
<font-awesome-icon :icon="['fas', 'desktop']" />
<i class="fas fa-desktop"></i>
</div>
</el-tooltip>
<el-tooltip
Expand All @@ -59,7 +59,7 @@
@click="toOutLink('https://www.showdoc.com.cn/runapi')"
class="icon-item"
>
<font-awesome-icon :icon="['fas', 'link']" />
<i class="fas fa-link"></i>
</div>
</el-tooltip>
<el-tooltip
Expand All @@ -69,37 +69,34 @@
placement="top"
>
<div @click="toPath('/admin/index')" class="icon-item">
<font-awesome-icon :icon="['fas', 'gear']" />
<i class="fas fa-gear"></i>
</div>
</el-tooltip>
<div class="inline">
<el-dropdown :show-timeout="0" trigger="hover">
<div class="icon-item">
<span class="el-dropdown-link">
<font-awesome-icon :icon="['fas', 'ellipsis']" />
<i class="fas fa-ellipsis"></i>
</span>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
v-if="$lang == 'zh-cn'"
@click.native="toOutLink('https://www.dfyun.com.cn/')"
>
<font-awesome-icon :icon="['fas', 'rocket']" />
<i class="fas fa-rocket"></i>
CDN加速
</el-dropdown-item>
<el-dropdown-item
v-if="$lang == 'zh-cn'"
@click.native="toOutLink('https://push.showdoc.com.cn')"
>
<font-awesome-icon :icon="['fas', 'car-side']" />
<i class="fas fa-car-side"></i>
推送服务
</el-dropdown-item>

<el-dropdown-item @click.native="logout">
<font-awesome-icon
:icon="['fas', 'right-from-bracket']"
rotation="180"
/>
<i class="fas fa-right-from-bracket" style="transform: rotate(180deg)" ></i>
{{ $t('logout') }}</el-dropdown-item
>
</el-dropdown-menu>
Expand Down
13 changes: 6 additions & 7 deletions web_src/src/components/item/home/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
@click="changeGroup(0)"
>
<div class="item-one-block-content">
<font-awesome-icon class="mr-1" :icon="['fas', 'files']" />{{
<i class="mr-1 fas fa-files"></i>
{{
$t('all_items')
}}
</div>
Expand All @@ -40,10 +41,7 @@
@click="changeGroup(-1)"
>
<div class="item-one-block-content">
<font-awesome-icon
class="mr-1 v3-color-yellow"
:icon="['fas', 'star']"
/>
<i class="mr-1 v3-color-yellow fas fa-star"></i>
{{ $t('star_items') }}
</div>
</div>
Expand All @@ -57,7 +55,8 @@
:content="$t('item_group_desc')"
placement="top"
><i class="el-icon-plus mr-1"></i
></el-tooltip>
>
</el-tooltip>
</div>
</div>
<div>
Expand All @@ -72,7 +71,7 @@
@click="changeGroup(one.id)"
>
<div class="item-one-block-content">
<font-awesome-icon class="mr-1" :icon="['far', 'hashtag']" />
<i class="mr-1 far v3-font-size-sm fa-hashtag"></i>
{{ one.group_name }}
</div>
</div>
Expand Down

0 comments on commit 4e770bd

Please sign in to comment.