Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade font-awesome to 5.8.1 #792

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgrade font-awesome to 5.8.1 #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"devDependencies": {
"jquery": "^2.2.3",
"bootstrap": "^3.4.1",
"font-awesome": "fontawesome#^4.6.1",
"font-awesome": "fontawesome#^5.8.1",
"fastclick": "^1.0.6",
"nprogress": "^0.2.0",
"Chart.js": "^2.0.2",
Expand Down
30 changes: 20 additions & 10 deletions build/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,34 @@ html , body{
margin-bottom: 10px;
float: left
}
.main_menu span.fa {
.main_menu span.fa,
.main_menu span.fab,
.main_menu span.fas {
float: right;
text-align: center;
margin-top: 5px;
font-size: 10px;
min-width: inherit;
color: #C4CFDA
}
.active a span.fa {
.active a span.fa,
.active a span.fab,
.active a span.fas {
text-align: right !important;
margin-right: 4px
}
.nav-sm .menu_section {
margin: 0
}
.nav-sm span.fa,
.nav-sm span.fab,
.nav-sm span.fas,
.nav-sm .menu_section h3 {
display: none
}
.nav-sm li li span.fa {
.nav-sm li li span.fa,
.nav-sm li li span.fab,
.nav-sm li li span.fas {
display: inline-block
}
.nav_menu {
Expand Down Expand Up @@ -1832,25 +1840,27 @@ h4.graph_title {
padding-left: 10px;
border-radius: 4px
}
.fontawesome-icon-list .fa-hover a:hover .fa {
.fontawesome-icon-list .fa-hover a:hover .fa,
.fontawesome-icon-list .fb-hover a:hover .fab,
.fontawesome-icon-list .fa-hover a:hover .fas {
font-size: 28px;
vertical-align: -6px
}
.fontawesome-icon-list .fa-hover a .fa {
.fontawesome-icon-list .fa-hover a .fa,
.fontawesome-icon-list .fa-hover a .fab,
.fontawesome-icon-list .fa-hover a .fas {
width: 32px;
font-size: 16px;
display: inline-block;
text-align: right;
margin-right: 10px
}
.main_menu .fa {
.main_menu .fa,
.main_menu .fab,
.main_menu .fas {
width: 26px;
opacity: .99;
display: inline-block;
font-family: FontAwesome;
font-style: normal;
font-weight: normal;
font-size: 18px;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale
}
Expand Down
4 changes: 2 additions & 2 deletions build/css/custom.min.css
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions docs/fonts/css/all.min.css
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions docs/fonts/css/v4-shims.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

<link href="css/bootstrap.min.css" rel="stylesheet">

<link href="fonts/css/font-awesome.min.css" rel="stylesheet">
<link href="fonts/css/all.min.css" rel="stylesheet">
<link href="fonts/css/v4-shims.min.css" rel="stylesheet">
<link href="css/animate.min.css" rel="stylesheet">

<!-- Documentation extras -->
Expand Down Expand Up @@ -157,7 +158,8 @@ <h4>Header</h4>

<link href="css/bootstrap.min.css" rel="stylesheet">

<link href="fonts/css/font-awesome.min.css" rel="stylesheet">
<link href="fonts/css/all.min.css" rel="stylesheet">
<link href="fonts/css/v4-shims.min.css" rel="stylesheet">
<link href="css/animate.min.css" rel="stylesheet">

<!--[if lt IE 9]>
Expand Down
6 changes: 4 additions & 2 deletions docs/index_cn.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

<link href="css/bootstrap.min.css" rel="stylesheet">

<link href="fonts/css/font-awesome.min.css" rel="stylesheet">
<link href="fonts/css/all.min.css" rel="stylesheet">
<link href="fonts/css/v4-shims.min.css" rel="stylesheet">
<link href="css/animate.min.css" rel="stylesheet">

<!-- Documentation extras -->
Expand Down Expand Up @@ -180,7 +181,8 @@ <h4>标题</h4>

<link href="css/bootstrap.min.css" rel="stylesheet">

<link href="fonts/css/font-awesome.min.css" rel="stylesheet">
<link href="fonts/css/all.min.css" rel="stylesheet">
<link href="fonts/css/v4-shims.min.css" rel="stylesheet">
<link href="css/animate.min.css" rel="stylesheet">

<!-- Theme styling -->
Expand Down
3 changes: 2 additions & 1 deletion production/calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- FullCalendar -->
Expand Down
3 changes: 2 additions & 1 deletion production/chartjs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/chartjs2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/contacts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/e_commerce.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- iCheck -->
Expand Down
3 changes: 2 additions & 1 deletion production/echarts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/fixed_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- jQuery custom content scroller -->
Expand Down
3 changes: 2 additions & 1 deletion production/fixed_sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- jQuery custom content scroller -->
Expand Down
5 changes: 3 additions & 2 deletions production/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Gentelella Alela! | </title>

<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- iCheck -->
Expand Down
3 changes: 2 additions & 1 deletion production/form_advanced.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- bootstrap-daterangepicker -->
Expand Down
5 changes: 3 additions & 2 deletions production/form_buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

<!-- Custom Theme Style -->
<link href="../build/css/custom.min.css" rel="stylesheet">
</head>
Expand Down
3 changes: 2 additions & 1 deletion production/form_upload.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- Dropzone.js -->
Expand Down
5 changes: 3 additions & 2 deletions production/form_validation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

<!-- Custom Theme Style -->
<link href="../build/css/custom.min.css" rel="stylesheet">
</head>
Expand Down
3 changes: 2 additions & 1 deletion production/form_wizards.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/general_elements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- iCheck -->
Expand Down
5 changes: 3 additions & 2 deletions production/glyphicons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

<!-- Custom styling plus plugins -->
<link href="../build/css/custom.min.css" rel="stylesheet">
</head>
Expand Down
8 changes: 6 additions & 2 deletions production/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

<!-- Custom styling plus plugins -->
<link href="../build/css/custom.min.css" rel="stylesheet">
</head>
Expand Down Expand Up @@ -1979,6 +1980,9 @@ <h4><i class="fa fa-warning"></i> Warning!</h4> Apparently, Adblock Plus can rem
<div class="fa-hover col-md-3 col-sm-4 col-xs-12"><a href="#/adn"><i class="fa fa-adn"></i> fa-adn</a>
</div>

<div class="fa-hover col-md-3 col-sm-4 col-xs-12"><a href="#/amazon"><i class="fab fa-amazon"></i> fab fa-amazon</a>
</div>

<div class="fa-hover col-md-3 col-sm-4 col-xs-12"><a href="#/android"><i class="fa fa-android"></i> fa-android</a>
</div>

Expand Down
3 changes: 2 additions & 1 deletion production/inbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- bootstrap-wysiwyg -->
Expand Down
3 changes: 2 additions & 1 deletion production/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- iCheck -->
Expand Down
3 changes: 2 additions & 1 deletion production/index2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- bootstrap-daterangepicker -->
Expand Down
3 changes: 2 additions & 1 deletion production/index3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- bootstrap-progressbar -->
Expand Down
3 changes: 2 additions & 1 deletion production/invoice.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/level2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">

Expand Down
3 changes: 2 additions & 1 deletion production/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/all.min.css" rel="stylesheet">
<link href="../vendors/font-awesome/css/v4-shims.min.css" rel="stylesheet">
<!-- NProgress -->
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
<!-- Animate.css -->
Expand Down
Loading