harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #362 from Treer/fontawesome

Browse Source 
Update Font-Awesome to 4.6.1
This commit is contained in:
redmatrix
2016-05-01 08:02:03 +10:00
parent 8a41e2a011 3fe8fc0aa8
commit 9446d0cbb4
512 changed files with 27303 additions and 22803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/theme/redbasic/css/style.css
View File

@@ -1848,7 +1848,7 @@ dl.bb-dl > dd > li {
}
.bootstrap-tagsinput .tag:before {
/* Copied from icon-asterisk, is there a better way to do it? */
/* Copied from fa-asterisk, is there a better way to do it? */
font-family: FontAwesome;
font-weight: normal;
font-style: normal;

4
view/theme/redbasic/js/redbasic.js
View File

@@ -17,7 +17,7 @@ $(document).ready(function() {
$('#css3-calc').remove(); // Remove the test element
$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
$('main').toggleClass('region_1-on');
});
@@ -29,7 +29,7 @@ $(document).ready(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
}
$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
$('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
if($('#tabs-collapse-1').length === 0) {

6
view/theme/redbasic/schema/bluegrid.css
View File

@@ -433,7 +433,7 @@ input {
border-color: #AC2925 !important;
}
a:hover > .icon-trash {
a:hover > .fa-trash-o {
color: #C9302C !important;
}
@@ -450,10 +450,10 @@ a:hover > .icon-trash {
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF;
}
.navbar-inverse .navbar-toggle .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left {
.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left {
color: #FFF;
}
.navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-left {
.navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
color: #43488A;
}
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {