jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

updated to font-awesome 5 (#181)

Browse Source
This commit is contained in:
Kevin Papst
2018-06-26 19:58:20 +02:00
committed by GitHub
parent d4a46cf257
commit b58de9be9c
57 changed files with 4220 additions and 2963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
assets/css/kimai.scss → assets/css/app.scss
View File

@@ -109,6 +109,26 @@ li.open .ticktac i.running{
left: 80px;
}
/* ================================ FONT AWESOME 5 ================================ */
.sidebar-menu>li>a>.far,
.sidebar-menu>li>a>.fas,
.sidebar-menu>li>a>.fal,
.sidebar-menu>li>a>.fab {
width: 20px;
}
.sidebar-menu .treeview-menu>li>a>.far,
.sidebar-menu .treeview-menu>li>a>.fas,
.sidebar-menu .treeview-menu>li>a>.fal,
.sidebar-menu .treeview-menu>li>a>.fab {
width: 20px;
}
.main-header .sidebar-toggle {
font-family: "Font Awesome 5 Free";
font-weight: 900;
}
/* ================================ FOOTER ================================ */
footer.main-footer {

7
assets/css/vendor.scss
View File

@@ -1,8 +1,11 @@
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$fa-font-path: "~font-awesome/fonts";
$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
@import '~bootstrap-sass/assets/stylesheets/bootstrap';
@import '~font-awesome/scss/font-awesome';
@import '~@fortawesome/fontawesome-free/scss/fontawesome';
@import '~@fortawesome/fontawesome-free/scss/fa-regular';
@import '~@fortawesome/fontawesome-free/scss/fa-solid';
@import '~@fortawesome/fontawesome-free/scss/fa-brands';
@import '~daterangepicker/daterangepicker.css';
@import '~bootstrap-select/dist/css/bootstrap-select.min.css';

2
assets/js/app.js
View File

@@ -20,7 +20,7 @@ global.Chart = Chart;
require('../css/vendor.scss');
require('../../vendor/almasaeed2010/adminlte/dist/css/AdminLTE.min.css');
require('../../vendor/almasaeed2010/adminlte/dist/css/skins/_all-skins.css');
require('../css/kimai.scss');
require('../css/app.scss');
global.$.AdminLTE = {};
global.$.AdminLTE.options = {};