1
0
mirror of https://github.com/flextype/flextype.git synced 2025-08-24 05:43:10 +02:00

feat(admin-plugin): add ability to use local version of fontawesome #322

This commit is contained in:
Awilum
2019-12-10 19:29:06 +03:00
parent 280435a518
commit ec5406ea15
7 changed files with 15 additions and 12 deletions

View File

@@ -75,7 +75,7 @@
margin-right: 1px;
}
.flextype-user > .nav .nav-item .nav-link i {
.flextype-user > .nav .nav-item .nav-link svg {
position: relative;
top: 2px;
}
@@ -85,10 +85,11 @@
opacity: 1;
}
.nav .nav-item .nav-link i {
.nav .nav-item .nav-link svg {
font-size: 18px;
margin-right: 15px;
width: 15px;
width: 22px;
height: 18px;
text-align: center;
vertical-align: middle;
float: left;

View File

@@ -1,8 +1,7 @@
.profile {
text-align: center;
.fas {
display: block;
svg {
font-size: 148px;
margin-bottom: 30px;
}

View File

@@ -508,17 +508,19 @@ textarea.form-control.code-editor {
padding: .25rem 1.1rem;
font-size: 14px;
> i {
width: 24px;
> svg {
font-size: 14px;
margin-right: 8px;
width: 24px!important;
}
}
.nav-pills {
.nav-link {
> i {
width: 24px;
> svg {
font-size: 14px;
margin-right: 8px;
width: 24px!important;
}
}

View File

@@ -83,7 +83,8 @@ gulp.task('js', function(){
'node_modules/messenger-hubspot/build/js/messenger.min.js',
'node_modules/messenger-hubspot/build/js/messenger-theme-flat.js',
'node_modules/clipboard/dist/clipboard.min.js',
'node_modules/bs-custom-file-input/dist/bs-custom-file-input.min.js'
'node_modules/bs-custom-file-input/dist/bs-custom-file-input.min.js',
'node_modules/@fortawesome/fontawesome-free/js/all.min.js'
])
.pipe(sourcemaps.init())
.pipe(concat('admin-build.min.js'))

View File

@@ -7,6 +7,7 @@
"bs-custom-file-input": "~1.3.2",
"clipboard": "~2.0.4",
"codemirror": "~5.49.2",
"@fortawesome/fontawesome-free": "5.11.2",
"del": "~3.0.0",
"es6-promise": "~4.2.5",
"gulp": "~3.9.1",

View File

@@ -13,7 +13,6 @@
<title>FLEXTYPE</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<script src="https://kit.fontawesome.com/588226d8c5.js" crossorigin="anonymous"></script>
{% set admin_build = base_url() ~ '/site/plugins/admin/assets/dist/css/admin-build.min.css' %}
{% set admin_elegant = base_url() ~ '/site/plugins/admin/assets/dist/css/elegant.css' %}

View File

@@ -2,7 +2,7 @@
{% block content %}
<div class="profile">
<i class="fas fa-user-circle"></i>
<i class="fas fa-user-circle"></i><br>
{{ tr('admin_username') }}: {{ username }} <br>
{{ tr('admin_role') }}: {{ rolename }}<br>
<br>